refactor: 彻底删除计划模块status字段+新增蓝色tip

- 数据库: DROP plan_finances.status 列(幂等迁移)
- 后端: routes.py TABLES移除status, migrate用显式列名
- 前端: plan.js移除表单/表格/过滤/汇总所有status引用
- planFilter值从待签约改为projects
- 计划页面顶部新增蓝色tip提醒条
- 版本号 v1.0.0.22

backend/migrations/columns.py

@@ -114,5 +114,14 @@ def migrate_add_columns():
 
         conn.commit()
         print("[migrate] 加列迁移完成")
+
+        # 删除 plan_finances.status 列（计划模块不再需要状态字段）
+        cur = conn.cursor()
+        cur.execute("SHOW COLUMNS FROM plan_finances LIKE 'status'")
+        if cur.fetchone():
+            cur.execute("ALTER TABLE plan_finances DROP COLUMN status")
+            conn.commit()
+            print("[migrate] plan_finances.status 列已删除")
+        cur.close()
     finally:
         conn.close()

backend/migrations/data_fixes.py

@@ -121,11 +121,16 @@ def migrate_move_pending_to_plan():
     conn = db()
     try:
         cur = conn.cursor()
+        # 获取 plan_finances 的列名（排除 status，因计划模块已删除该列）
+        cur.execute("SHOW COLUMNS FROM plan_finances")
+        plan_cols = [row[0] for row in cur.fetchall()]
+        col_list = ", ".join(plan_cols)
+
         # 仅迁移 id 不存在于计划表的待签约项目
         cur.execute(
-            "INSERT INTO plan_finances "
-            "SELECT * FROM project_finances WHERE status='待签约' "
-            "AND id NOT IN (SELECT id FROM plan_finances)"
+            f"INSERT INTO plan_finances ({col_list}) "
+            f"SELECT {col_list} FROM project_finances WHERE status='待签约' "
+            f"AND id NOT IN (SELECT id FROM plan_finances)"
         )
         moved = cur.rowcount
         if moved:

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", "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", "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"]),
+    "planFinances": ("plan_finances", ["project_id", "tenant", "business_type", "customer_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"]),
     "planExpense": ("plan_expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
 }
 

static/modules/plan.js

@@ -22,8 +22,8 @@ function renderPlan() {
   const months = displayMonths.map(d => d.key);
   const monthLabels = displayMonths.map(d => d.label);
 
-  const signed = pfs.filter(x => x.status === "已签约");
-    const pending = pfs.filter(x => x.status === "待签约");
+  const signed = pfs;
+    const pending = pfs;
   const sumSign = Math.round(signed.reduce((s,x) => s + (x.sign_amount||0), 0));
   const sumPending = Math.round(pending.reduce((s,x) => s + (x.sign_amount||0), 0));
   
@@ -95,8 +95,8 @@ function renderPlan() {
       }
     })();
     const sm = pf.sign_month || "";
-    const signMonthCell = `<td class="p-2 text-center align-middle text-sm"><span class="pf-sm-text cursor-pointer hover:text-blue-600" id="pf-sm-${pf.id}" onclick="event.stopPropagation(); editPfSignMonth(event, ${pf.id})">${sm || '—'}</span></td>`;
-    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">${esc(pf.customer_name)}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
+    const signMonthCell = `<td class="p-2 text-center align-middle text-sm"><span class="pf-sm-text cursor-pointer hover:text-blue-600" id="pf-sm-${pf.id}" onclick="event.stopPropagation(); planEditSignMonth(event, ${pf.id})">${sm || '—'}</span></td>`;
+    return `<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="planOpenPfEditModal(${pf.id})"><td class="p-2 text-sm font-medium text-center align-middle">${esc(pf.customer_name)}</td>${signMonthCell}<td class="p-2 text-center align-middle text-sm">${money(pf.sign_amount)}</td>${mCols}${totalCol}</tr>`;
   };
 
   const now2 = new Date();
@@ -114,12 +114,16 @@ function renderPlan() {
   const finHeaderBase = `<span class="text-sm text-slate-500">视图：</span><select onchange="setPlanView(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.planView==='overview'?'selected':''}>总视图</option><option value="quarterly" ${state.planView==='quarterly'?'selected':''}>季度视图</option><option value="monthly" ${state.planView==='monthly'?'selected':''}>月度视图</option></select>${toolDateSelect}`;
   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('待签约')" class="finance-tab${state.planFilter==='待签约'?' active':''}" style="font-size:14px;font-weight:600">项目计划 (${pfs.filter(x=>x.status==='待签约').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('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">
+    <div class="flex items-center gap-3 px-4 py-3 rounded-lg border" style="background:linear-gradient(135deg,#dbeafe,#bfdbfe);border-color:#3b82f6">
+      <i data-lucide="lightbulb" class="text-blue-600 flex-shrink-0" style="width:18px;height:18px"></i>
+      <span class="text-sm text-blue-900"><strong>计划提醒：</strong>计划也是预算，只有真正能够列出计划的预算，才有靠谱的落地可能性</span>
+    </div>
     ${planFilterTabs}
     ${state.planFilter !== 'expense' && state.planFilter !== '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="closePlanModal()"><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="deletePlanItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanModal()"><i data-lucide="x"></i></button></div></div>
+    <div id="planModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closePlanModal()"><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="planModalTitle">新增项目财务</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="planDeleteBtn" onclick="deletePlanItem()"><i data-lucide="trash-2"></i>删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closePlanModal()"><i data-lucide="x"></i></button></div></div>
   <div class="finance-tabs">
     <button class="finance-tab active" data-tab="info" onclick="switchPlanTab('info')"><i data-lucide="info" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>基本信息</button>
     <button class="finance-tab" data-tab="revpay" onclick="switchPlanTab('revpay')"><i data-lucide="dollar-sign" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>确收与回款</button>
@@ -128,9 +132,9 @@ function renderPlan() {
     <button class="finance-tab" data-tab="tasks" onclick="switchPlanTab('tasks')"><i data-lucide="list-checks" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>任务管理</button>
     <button class="finance-tab" data-tab="activity" onclick="switchPlanTab('activity')"><i data-lucide="message-square" style="width:14px;height:14px;display:inline-block;vertical-align:-2px;margin-right:4px"></i>活动与跟进</button>
   </div>
-<form onsubmit="createPlanFinance(event)" class="plan-form" novalidate><input type="hidden" name="pf_id" id="pf-id-input" value="">
-<div class="plan-tab-body">
-<div id="financeTabInfo">
+<form onsubmit="createPlanFinance(event)" class="finance-form" novalidate><input type="hidden" name="pf_id" id="plan_pf-id-input" value="">
+<div class="finance-tab-body">
+<div id="plan_financeTabInfo">
   <div class="grid gap-4">
     <div class="grid grid-cols-3 gap-3">
       <label class="block"><span class="fin-label">部门</span><input type="hidden" name="project_id" value="${state.tenant}"><input class="form-ctrl bg-slate-50 cursor-not-allowed" value="${state.tenant}" disabled></label>
@@ -140,7 +144,7 @@ function renderPlan() {
     <div class="grid grid-cols-3 gap-3">
       <label class="block"><span class="fin-label">签约金额（元） <span class="text-red-500">*</span></span><input name="sign_amount" class="form-ctrl" placeholder="必须大于 0"></label>
       <label class="block"><span class="fin-label">签约月份 <span class="text-red-500">*</span></span><select name="sign_month" required class="form-ctrl bg-white"><option value="">选择</option>${monthOptions('')}</select></label>
-      <label class="block"><span class="fin-label">项目状态</span><select name="status" class="form-ctrl bg-white"><option>待签约</option></select></label>
+      
     </div>
     <div class="grid grid-cols-3 gap-3">
       <label class="block"><span class="fin-label">商务负责人 <span class="text-red-500">*</span></span><input name="sales_person" required class="form-ctrl" placeholder="请输入商务负责人"></label>
@@ -151,10 +155,10 @@ function renderPlan() {
       <label class="block"><span class="fin-label">联系电话</span><input name="contact_phone" class="form-ctrl" placeholder="请输入联系电话"></label>
       <label class="block"><span class="fin-label">其他</span><input name="other_info" class="form-ctrl" placeholder="备注信息"></label>
     </div>
-    <div class="block"><span class="fin-label">业务类型</span><div class="flex flex-wrap gap-2 mt-1" id="businessTypeChecks">${fmTypes.map(t => `<label class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full border border-slate-200 cursor-pointer hover:border-blue-300 text-sm bt-chip" onclick="toggleBtChip(this)"><input type="checkbox" name="business_type[]" value="${t}" class="hidden"><span>${t}</span></label>`).join("")}</div></div>
+    <div class="block"><span class="fin-label">业务类型</span><div class="flex flex-wrap gap-2 mt-1" id="plan_businessTypeChecks">${fmTypes.map(t => `<label class="inline-flex items-center gap-1 px-2.5 py-1 rounded-full border border-slate-200 cursor-pointer hover:border-blue-300 text-sm bt-chip" onclick="planToggleBtChip(this)"><input type="checkbox" name="business_type[]" value="${t}" class="hidden"><span>${t}</span></label>`).join("")}</div></div>
   </div>
 </div>
-<div id="financeTabExec" class="hidden">
+<div id="plan_financeTabExec" class="hidden">
   <div class="fin-field-group">
     <p class="fin-section-label">执行信息</p>
     <div class="grid grid-cols-3 gap-4">
@@ -165,53 +169,53 @@ function renderPlan() {
     </div>
   </div>
 </div>
-<div id="financeTabRevpay" class="hidden">
-  <div class="grid grid-cols-3 gap-3 mb-4" id="revpaySummary">
+<div id="plan_financeTabRevpay" class="hidden">
+  <div class="grid grid-cols-3 gap-3 mb-4" id="plan_revpaySummary">
     <div class="bg-blue-50 rounded-lg p-3 text-center border border-blue-100">
       <p class="text-xs text-blue-600 font-medium">总确收</p>
-      <p class="text-lg font-bold text-blue-700" id="revpayTotalRev">¥0</p>
+      <p class="text-lg font-bold text-blue-700" id="plan_revpayTotalRev">¥0</p>
     </div>
     <div class="bg-green-50 rounded-lg p-3 text-center border border-green-100">
       <p class="text-xs text-green-600 font-medium">总毛利</p>
-      <p class="text-lg font-bold text-green-700" id="revpayTotalGross">¥0</p>
+      <p class="text-lg font-bold text-green-700" id="plan_revpayTotalGross">¥0</p>
     </div>
     <div class="bg-amber-50 rounded-lg p-3 text-center border border-amber-100">
       <p class="text-xs text-amber-600 font-medium">总回款</p>
-      <p class="text-lg font-bold text-amber-700" id="revpayTotalPayment">¥0</p>
+      <p class="text-lg font-bold text-amber-700" id="plan_revpayTotalPayment">¥0</p>
     </div>
   </div>
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="revpayTable">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_revpayTable">
     <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-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-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="revpayTbody"></tbody>
+    <tbody id="plan_revpayTbody"></tbody>
   </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addRevpayRow()"><i data-lucide="plus"></i>添加月份</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddRevpayRow()"><i data-lucide="plus"></i>添加月份</button>
 </div>
-<div id="financeTabCost" class="hidden">
-  <div class="grid grid-cols-2 gap-3 mb-4" id="costSummary">
+<div id="plan_financeTabCost" class="hidden">
+  <div class="grid grid-cols-2 gap-3 mb-4" id="plan_costSummary">
     <div class="bg-rose-50 rounded-lg p-3 text-center border border-rose-100">
       <p class="text-xs text-rose-600 font-medium">总成本</p>
-      <p class="text-lg font-bold text-rose-700" id="costTotalCost">¥0</p>
+      <p class="text-lg font-bold text-rose-700" id="plan_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-lg font-bold text-purple-700" id="costTotalPaid">¥0</p>
+      <p class="text-lg font-bold text-purple-700" id="plan_costTotalPaid">¥0</p>
     </div>
   </div>
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="costTable">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_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>
-    <tbody id="costTbody"></tbody>
+    <tbody id="plan_costTbody"></tbody>
   </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addCostRow()"><i data-lucide="plus"></i>添加月份</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddCostRow()"><i data-lucide="plus"></i>添加月份</button>
 </div>
-<div id="financeTabTasks" class="hidden">
-  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="taskTable">
+<div id="plan_financeTabTasks" class="hidden">
+  <table class="w-full text-sm border border-slate-200 rounded-lg overflow-hidden" id="plan_taskTable">
     <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:120px">月份</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-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-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 w-8"></th></tr></thead>
-    <tbody id="taskTbody"></tbody>
+    <tbody id="plan_taskTbody"></tbody>
   </table>
-  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="addTaskRow()"><i data-lucide="plus"></i>添加任务</button>
+  <button type="button" class="btn btn-ghost btn-sm mt-3" onclick="planAddTaskRow()"><i data-lucide="plus"></i>添加任务</button>
 </div>
-<div id="financeTabActivity" class="hidden">
-  <div class="grid gap-2" id="finActivityList"></div>
+<div id="plan_financeTabActivity" class="hidden">
+  <div class="grid gap-2" id="plan_finActivityList"></div>
   <div class="comment-box mt-3">
     <div class="squire-toolbar">
       <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('bold')" title="加粗"><i data-lucide="bold"></i></button>
@@ -226,24 +230,24 @@ function renderPlan() {
       <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('undo')" title="撤销"><i data-lucide="undo"></i></button>
       <button type="button" class="squire-btn" onmousedown="event.preventDefault();squireCmd('redo')" title="重做"><i data-lucide="redo"></i></button>
     </div>
-    <div class="squire-editor" id="squire_finance" placeholder="添加评论"></div>
+    <div class="squire-editor" id="plan_squire_finance" placeholder="添加评论"></div>
     <div class="comment-toolbar">
       <span class="comment-hint">支持富文本编辑</span>
-      <button class="btn btn-primary btn-sm comment-submit" type="button" onclick="submitFinComment()">评论</button>
+      <button class="btn btn-primary btn-sm comment-submit" type="button" onclick="planSubmitComment()">评论</button>
     </div>
   </div>
 </div>
-</div><div class="flex justify-end gap-3 pt-2 plan-form-actions"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closePlanModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></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="closePlanModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>
     ${(() => {
       if (state.planFilter === 'overview') {
         setTimeout(() => renderPlanOverview(), 10);
-        return `<div id="financeOverview"></div>`;
+        return `<div id="planOverview"></div>`;
       }
       if (state.planFilter === 'expense') {
         setTimeout(() => renderPlanExpense(), 10);
         return `<div id="planExpenseModule"></div>`;
       }
-      const isUnsigned = state.planFilter === '待签约';
+      const isUnsigned = false;
       const METRIC_CARDS = [
         { label: '签约金额', value: ctx => moneyWan(ctx.signTotal), color: 'text-slate-700' },
         { label: '已确收', hideUnsigned: true, value: ctx => moneyWan(ctx.sumRev), color: 'text-blue-700' },
@@ -257,7 +261,7 @@ function renderPlan() {
         { 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' },
-      ].filter(c => state.planFilter !== '待签约' || !c.hideUnsigned);
+      ].filter(c => true);
 
       // 列排序
       if (!state.planSort) state.planSort = { key: null, asc: true };
@@ -285,7 +289,7 @@ function renderPlan() {
       };
       const SIGNED_COLS = [
         { key: 'customer_name', label: '项目名称' },
-        { key: 'status', label: '状态' },
+       ,
         { key: 'sign_amount', label: '签约金额' },
         { key: 'rev', label: '已确收' },
         { key: 'gross', label: '毛利' },
@@ -301,7 +305,7 @@ function renderPlan() {
       ];
       const UNSIGNED_COLS = [
         { key: 'customer_name', label: '项目名称' },
-        { key: 'status', label: '状态' },
+       ,
         { key: 'sign_amount', label: '签约金额' },
         { key: 'sign_month', label: '签约月份' },
         { key: 'gross', label: '毛利' },
@@ -316,7 +320,7 @@ function renderPlan() {
           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 : 13;
         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';
@@ -336,25 +340,23 @@ function renderPlan() {
         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 = '<span class="text-amber-600">待签约</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="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">${st}</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="planOpenPfEditModal(${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 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>`;
       };
       // 待签约简版行
       const tdRowUnsigned = (pf, cost, gross) => {
-        const st = '<span class="text-amber-600">待签约</span>';
-        const profit = 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">${st}</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="planOpenPfEditModal(${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>`;
       };
 
       if (state.planView === 'monthly') {
-        const allPfs = pfs.filter(x => x.status === state.planFilter);
+        const allPfs = pfs;
         const now = new Date();
         const defaultMonth = now.getFullYear() + "-" + String(now.getMonth() + 1).padStart(2, "0");
         if (!state.planMonth) state.planMonth = defaultMonth;
@@ -374,8 +376,7 @@ function renderPlan() {
           dataItems.push({
             pf: pf,
             customer_name: pf.customer_name || '',
-            status: pf.status || '',
-            sign_amount: pf.sign_amount || 0,
+                        sign_amount: pf.sign_amount || 0,
             sign_month: pf.sign_month || '',
             rev: rev, gross: gross, cost: cost,
             profit: gross, payment: payment, paid: paid,
@@ -395,12 +396,12 @@ function renderPlan() {
           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;
+        const signCnt = allPfs.filter(x => (x.sign_month || "").substring(0, 7) === selMonth).length;
         return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该月份暂无数据');
       }
 
       if (state.planView === 'quarterly') {
-        const allPfs = pfs.filter(x => x.status === state.planFilter);
+        const allPfs = pfs;
         const qRanges = [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]];
         const now = new Date();
         if (state.planQuarter === undefined) {
@@ -430,8 +431,7 @@ function renderPlan() {
           dataItems.push({
             pf: pf,
             customer_name: pf.customer_name || '',
-            status: pf.status || '',
-            sign_amount: pf.sign_amount || 0,
+                        sign_amount: pf.sign_amount || 0,
             sign_month: pf.sign_month || '',
             rev: rev, gross: gross, cost: cost,
             profit: gross, payment: payment, paid: paid,
@@ -451,7 +451,7 @@ function renderPlan() {
           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;
+        const signCnt = allPfs.filter(x => qRange.includes(parseInt((x.sign_month || "0").substring(5)) || 0)).length;
         return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '该季度暂无数据');
       }
 
@@ -465,15 +465,14 @@ function renderPlan() {
         expense.forEach(e => { cost += parseFloat(e.cost || 0) || 0; paid += parseFloat(e.paid || 0) || 0; });
         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.planFilter);
+      const allPfs = pfs;
       var dataItems = allPfs.map(pf => {
         var t = calcTotals(pf);
         var cashflow = t.payment - t.paid;
         return {
           pf: pf,
           customer_name: pf.customer_name || '',
-          status: pf.status || '',
-          sign_amount: pf.sign_amount || 0,
+                    sign_amount: pf.sign_amount || 0,
           rev: t.rev, gross: t.gross, cost: t.cost,
           profit: t.gross, payment: t.payment, paid: t.paid,
           cashflow: cashflow,
@@ -493,7 +492,7 @@ function renderPlan() {
         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;
+      const signCnt = allPfs.length;
       return renderView(rows, sumRev, sumPay, sumCost, sumPaid, sumGross, signTotal, signCnt, '暂无数据');
     })()}
   </div>`;
@@ -508,46 +507,46 @@ window.openPlanModal = () => {
   if (dept) dept.value = state.tenant;
   const pfIdInput = form.querySelector('[name="pf_id"]');
   if (!pfIdInput || !pfIdInput.value) {
-    initRevpayTable(null);
-    initCostTable(null);
-    initTaskTable(null);
+    planInitRevpayTable(null);
+    planInitCostTable(null);
+    planInitTaskTable(null);
     document.querySelector("#planDeleteBtn").classList.add("hidden");
   }
   modal.classList.remove("hidden");
 };
 
-window.addRevpayRow = (month = '', rev = '', gross = '', payment = '', rev_note = '') => {
-  const tbody = document.querySelector("#revpayTbody");
+window.planAddRevpayRow = (month = '', rev = '', gross = '', payment = '', rev_note = '') => {
+  const tbody = document.querySelector("#plan_revpayTbody");
   if (!tbody) return;
   const row = document.createElement("tr");
-  row.innerHTML = `<td><select name="budget_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="updateRevpaySummary()">${monthOptions(month)}</select></td>
-    <td><input name="budget_rev[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${rev}" oninput="updateRevpaySummary()"></td>
-    <td><input name="budget_gross[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${gross}" oninput="updateRevpaySummary()"></td>
-    <td><input name="budget_payment[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${payment}" oninput="updateRevpaySummary()"></td>
+  row.innerHTML = `<td><select name="budget_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="planUpdateRevpaySummary()">${monthOptions(month)}</select></td>
+    <td><input name="budget_rev[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${rev}" oninput="planUpdateRevpaySummary()"></td>
+    <td><input name="budget_gross[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${gross}" oninput="planUpdateRevpaySummary()"></td>
+    <td><input name="budget_payment[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${payment}" oninput="planUpdateRevpaySummary()"></td>
     <td><input name="budget_rev_note[]" class="form-ctrl form-ctrl-sm w-full" placeholder="备注" value="${rev_note}"></td>
-    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();updateRevpaySummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
+    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();planUpdateRevpaySummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
   tbody.appendChild(row);
   if (window.lucide) window.lucide.createIcons();
 };
 
-window.addCostRow = (month = '', expense_type = '', cost = '', paid = '', exp_note = '') => {
-  const tbody = document.querySelector("#costTbody");
+window.planAddCostRow = (month = '', expense_type = '', cost = '', paid = '', exp_note = '') => {
+  const tbody = document.querySelector("#plan_costTbody");
   if (!tbody) return;
   const row = document.createElement("tr");
-  row.innerHTML = `<td><select name="expense_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="updateCostSummary()">${monthOptions(month)}</select></td>
+  row.innerHTML = `<td><select name="expense_month[]" class="form-ctrl form-ctrl-sm w-full" style="min-width:140px" onchange="planUpdateCostSummary()">${monthOptions(month)}</select></td>
     <td><input name="expense_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="费用类型" value="${expense_type}"></td>
-    <td><input name="expense_cost[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${cost}" oninput="updateCostSummary()"></td>
-    <td><input name="expense_paid[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${paid}" oninput="updateCostSummary()"></td>
+    <td><input name="expense_cost[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${cost}" oninput="planUpdateCostSummary()"></td>
+    <td><input name="expense_paid[]" type="number" step="0.01" class="form-ctrl form-ctrl-sm w-full text-right" placeholder="0" value="${paid}" oninput="planUpdateCostSummary()"></td>
     <td><input name="expense_note[]" class="form-ctrl form-ctrl-sm w-full" placeholder="备注" value="${exp_note}"></td>
-    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();updateCostSummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
+    <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove();planUpdateCostSummary()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
   tbody.appendChild(row);
   if (window.lucide) window.lucide.createIcons();
 };
 
-window.updateRevpaySummary = () => {
-  const revEl = document.querySelector("#revpayTotalRev");
-  const grossEl = document.querySelector("#revpayTotalGross");
-  const paymentEl = document.querySelector("#revpayTotalPayment");
+window.planUpdateRevpaySummary = () => {
+  const revEl = document.querySelector("#plan_revpayTotalRev");
+  const grossEl = document.querySelector("#plan_revpayTotalGross");
+  const paymentEl = document.querySelector("#plan_revpayTotalPayment");
   if (!revEl || !paymentEl) return;
   const revInputs = document.querySelectorAll('[name="budget_rev[]"]');
   const grossInputs = document.querySelectorAll('[name="budget_gross[]"]');
@@ -561,9 +560,9 @@ window.updateRevpaySummary = () => {
   paymentEl.textContent = money(totalPayment);
 };
 
-window.updateCostSummary = () => {
-  const costEl = document.querySelector("#costTotalCost");
-  const paidEl = document.querySelector("#costTotalPaid");
+window.planUpdateCostSummary = () => {
+  const costEl = document.querySelector("#plan_costTotalCost");
+  const paidEl = document.querySelector("#plan_costTotalPaid");
   if (!costEl || !paidEl) return;
   const costInputs = document.querySelectorAll('[name="expense_cost[]"]');
   const paidInputs = document.querySelectorAll('[name="expense_paid[]"]');
@@ -574,27 +573,27 @@ window.updateCostSummary = () => {
   paidEl.textContent = money(totalPaid);
 };
 
-window.initRevpayTable = (budgetData) => {
-  const tbody = document.querySelector("#revpayTbody");
+window.planInitRevpayTable = (budgetData) => {
+  const tbody = document.querySelector("#plan_revpayTbody");
   if (!tbody) return;
   tbody.innerHTML = "";
   const rows = budgetData || [];
-  rows.forEach(r => addRevpayRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.rev_note || ''));
-  setTimeout(() => updateRevpaySummary(), 50);
+  rows.forEach(r => planAddRevpayRow(r.month || '', r.rev || '', r.gross || '', r.payment || '', r.rev_note || ''));
+  setTimeout(() => planUpdateRevpaySummary(), 50);
 };
 
-window.initCostTable = (expenseData) => {
-  const tbody = document.querySelector("#costTbody");
+window.planInitCostTable = (expenseData) => {
+  const tbody = document.querySelector("#plan_costTbody");
   if (!tbody) return;
   tbody.innerHTML = "";
   const rows = expenseData || [];
-  rows.forEach(r => addCostRow(r.month || '', r.expense_type || '', r.cost || '', r.paid || '', r.exp_note || ''));
-  setTimeout(() => updateCostSummary(), 50);
+  rows.forEach(r => planAddCostRow(r.month || '', r.expense_type || '', r.cost || '', r.paid || '', r.exp_note || ''));
+  setTimeout(() => planUpdateCostSummary(), 50);
 };
 
 // ---------- 任务管理 tab ----------
 
-function taskMonthOptions(selected) {
+function planTaskMonthOptions(selected) {
   const now = new Date();
   const opts = [];
   for (let i = -2; i <= 12; i++) {
@@ -605,36 +604,36 @@ function taskMonthOptions(selected) {
   return opts.join("");
 }
 
-window.addTaskRow = (taskMonth = '', taskType = '', taskCount = '', executedCount = '', unitPrice = '') => {
-  const tbody = document.querySelector("#taskTbody");
+window.planAddTaskRow = (taskMonth = '', taskType = '', taskCount = '', executedCount = '', unitPrice = '') => {
+  const tbody = document.querySelector("#plan_taskTbody");
   if (!tbody) return;
   const row = document.createElement("tr");
   const defaultMonth = (() => { const n = new Date(); return n.getFullYear() + "-" + String(n.getMonth()+1).padStart(2,"0"); })();
   const isPreset = TASK_TYPES.includes(taskType);
   const typeCell = isPreset || !taskType
-    ? `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="onTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option ${t === taskType ? 'selected' : ''}>${t}</option>`).join("")}<option value="__custom__" ${!isPreset && taskType ? 'selected' : ''}>自定义...</option></select>`
-    : `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" value="${esc(taskType)}" placeholder="输入自定义类型"><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="revertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
-  row.innerHTML = `<td><select name="task_month[]" class="form-ctrl form-ctrl-sm w-full">${taskMonthOptions(taskMonth || defaultMonth)}</select></td>
+    ? `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="planOnTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option ${t === taskType ? 'selected' : ''}>${t}</option>`).join("")}<option value="__custom__" ${!isPreset && taskType ? 'selected' : ''}>自定义...</option></select>`
+    : `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" value="${esc(taskType)}" placeholder="输入自定义类型"><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="planRevertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
+  row.innerHTML = `<td><select name="task_month[]" class="form-ctrl form-ctrl-sm w-full">${planTaskMonthOptions(taskMonth || defaultMonth)}</select></td>
     <td class="flex items-center">${typeCell}</td>
-    <td><input name="task_count[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${taskCount}" oninput="updateTaskDiff(this)"></td>
-    <td><input name="task_executed[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${executedCount}" oninput="updateTaskDiff(this)"></td>
+    <td><input name="task_count[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${taskCount}" oninput="planUpdateTaskDiff(this)"></td>
+    <td><input name="task_executed[]" type="number" step="1" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:100px" placeholder="0" value="${executedCount}" oninput="planUpdateTaskDiff(this)"></td>
     <td><input name="task_diff[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:80px" placeholder="—" disabled></td>
-    <td><input name="task_unit_price[]" type="number" step="0.01" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:90px" placeholder="0" value="${unitPrice}" oninput="updateTaskDiff(this)"></td>
+    <td><input name="task_unit_price[]" type="number" step="0.01" min="0" class="form-ctrl form-ctrl-sm text-right" style="width:90px" placeholder="0" value="${unitPrice}" oninput="planUpdateTaskDiff(this)"></td>
     <td><input name="task_exec_amount[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:140px" placeholder="—" disabled></td>
     <td><input name="task_unexec_amount[]" type="number" class="form-ctrl form-ctrl-sm text-right" style="width:140px" placeholder="—" disabled></td>
     <td><button type="button" class="btn btn-ghost btn-sm text-red-500 p-0 w-6 h-6" onclick="this.closest('tr').remove()"><i data-lucide="trash-2" style="width:14px;height:14px"></i></button></td>`;
   tbody.appendChild(row);
   if (window.lucide) window.lucide.createIcons();
-  updateRowCalc(row);
+  planUpdateRowCalc(row);
 };
 
-window.updateTaskDiff = (el) => {
+window.planUpdateTaskDiff = (el) => {
   const row = el.closest('tr');
   if (!row) return;
-  updateRowCalc(row);
+  planUpdateRowCalc(row);
 };
 
-function updateRowCalc(row) {
+function planUpdateRowCalc(row) {
   const countInput = row.querySelector('[name="task_count[]"]');
   const execInput = row.querySelector('[name="task_executed[]"]');
   const priceInput = row.querySelector('[name="task_unit_price[]"]');
@@ -655,7 +654,7 @@ function updateRowCalc(row) {
   unexecAmtInput.value = unexecAmt ? unexecAmt.toFixed(2) : '';
 }
 
-window.toggleBtChip = (chip) => {
+window.planToggleBtChip = (chip) => {
   const cb = chip.querySelector('input');
   cb.checked = !cb.checked;
   chip.classList.toggle('bg-blue-50', cb.checked);
@@ -663,35 +662,35 @@ window.toggleBtChip = (chip) => {
   chip.classList.toggle('text-blue-600', cb.checked);
 };
 
-window.initTaskTable = (taskData) => {
-  const tbody = document.querySelector("#taskTbody");
+window.planInitTaskTable = (taskData) => {
+  const tbody = document.querySelector("#plan_taskTbody");
   if (!tbody) return;
   tbody.innerHTML = "";
   const rows = taskData || [];
-  rows.forEach(r => addTaskRow(r.task_month || '', r.task_type || '', r.task_count || '', r.task_executed || '', r.unit_price || ''));
+  rows.forEach(r => planAddTaskRow(r.task_month || '', r.task_type || '', r.task_count || '', r.task_executed || '', r.unit_price || ''));
 };
 
-window.onTaskTypeChange = (sel) => {
+window.planOnTaskTypeChange = (sel) => {
   if (sel.value !== '__custom__') return;
   const td = sel.parentElement;
   const oldVal = sel.value;
-  td.innerHTML = `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="输入自定义类型" autofocus><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="revertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
+  td.innerHTML = `<input name="task_type[]" class="form-ctrl form-ctrl-sm w-full" placeholder="输入自定义类型" autofocus><button type="button" class="btn btn-ghost btn-sm text-slate-400 p-0 w-5 h-5 ml-1" onclick="planRevertTaskType(this)" title="返回选择"><i data-lucide="rotate-ccw" style="width:12px;height:12px"></i></button>`;
   if (window.lucide) window.lucide.createIcons();
   td.querySelector('input').focus();
 };
 
-window.revertTaskType = (btn) => {
+window.planRevertTaskType = (btn) => {
   const td = btn.parentElement;
-  td.innerHTML = `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="onTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option>${t}</option>`).join("")}<option value="__custom__">自定义...</option></select>`;
+  td.innerHTML = `<select name="task_type[]" class="form-ctrl form-ctrl-sm w-full" onchange="planOnTaskTypeChange(this)"><option value="">选择</option>${TASK_TYPES.map(t => `<option>${t}</option>`).join("")}<option value="__custom__">自定义...</option></select>`;
   if (window.lucide) window.lucide.createIcons();
 };
 
 window.closePlanModal = () => {
   const modal = document.querySelector("#planModal");
-  modal.classList.add("hidden");
+  if (modal) modal.classList.add("hidden");
 };
 
-window.editPfSignMonth = (event, pfId) => {
+window.planEditSignMonth = (event, pfId) => {
   event.stopPropagation();
   const pf = (state.data.planFinances || []).find(x => x.id === pfId);
   if (!pf) return;
@@ -707,11 +706,11 @@ window.editPfSignMonth = (event, pfId) => {
     try {
       await api(`/api/planFinances/${pfId}`, { method: "PUT", body: JSON.stringify({ data: { sign_month: newValue } }) });
       pf.sign_month = newValue;
-      td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="editPfSignMonth(event, ${pfId})">${newValue || '—'}</span>`;
+      td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="planEditSignMonth(event, ${pfId})">${newValue || '—'}</span>`;
     } catch (e) { toast("修改失败：" + e.message, "error"); }
   });
   select.addEventListener("blur", () => {
-    td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="editPfSignMonth(event, ${pfId})">${currentValue || '—'}</span>`;
+    td.innerHTML = `<span class="pf-sm-text cursor-pointer hover:text-blue-600" onclick="planEditSignMonth(event, ${pfId})">${currentValue || '—'}</span>`;
   });
   td.innerHTML = "";
   td.appendChild(select);
@@ -720,25 +719,25 @@ window.editPfSignMonth = (event, pfId) => {
 
 window.switchPlanTab = (tab) => {
   document.querySelectorAll(".plan-tab").forEach(b => b.classList.toggle("active", b.dataset.tab === tab));
-  document.querySelector("#financeTabInfo").classList.toggle("hidden", tab !== "info");
-  document.querySelector("#financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
-  document.querySelector("#financeTabCost").classList.toggle("hidden", tab !== "cost");
-  document.querySelector("#financeTabExec").classList.toggle("hidden", tab !== "exec");
-  document.querySelector("#financeTabTasks").classList.toggle("hidden", tab !== "tasks");
-  document.querySelector("#financeTabActivity").classList.toggle("hidden", tab !== "activity");
+  document.querySelector("#plan_financeTabInfo").classList.toggle("hidden", tab !== "info");
+  document.querySelector("#plan_financeTabRevpay").classList.toggle("hidden", tab !== "revpay");
+  document.querySelector("#plan_financeTabCost").classList.toggle("hidden", tab !== "cost");
+  document.querySelector("#plan_financeTabExec").classList.toggle("hidden", tab !== "exec");
+  document.querySelector("#plan_financeTabTasks").classList.toggle("hidden", tab !== "tasks");
+  document.querySelector("#plan_financeTabActivity").classList.toggle("hidden", tab !== "activity");
   document.querySelector(".plan-form-actions").classList.toggle("hidden", tab === "activity");
-  if (tab === "activity") initFinSquire();
+  if (tab === "activity") planInitSquire();
 };
 
 // ---------- 活动与跟进 ----------
 
-async function loadFinFollowups(pfId) {
-  const list = document.querySelector("#finActivityList");
+async function planLoadFollowups(pfId) {
+  const list = document.querySelector("#plan_finActivityList");
   if (!list || !pfId) return;
   try {
     const fups = await api(`/api/followups/project_finance/${pfId}`);
     list.innerHTML = fups.length
-      ? fups.map(f => `<div class="activity-item"><div class="activity-icon"><i data-lucide="message-square"></i></div><div class="min-w-0 flex-1"><div class="flex justify-between gap-3 text-[12px] text-slate-500"><span>${esc(f.follower)} · ${esc(f.follow_up_method)}</span><span>${esc(f.followed_at)}</span></div><div class="mt-1 leading-5 text-slate-800 rich-content" data-html="${encodeURIComponent(f.content || '')}"></div>${f.next_action ? `<p class="mt-1 leading-5 text-blue-700">下一步：${text(f.next_action)}</p>` : ""}</div><button class="activity-delete" type="button" onclick="deleteFinFollowup(event, ${f.id})" title="删除评论"><i data-lucide="trash-2"></i></button></div>`).join("")
+      ? fups.map(f => `<div class="activity-item"><div class="activity-icon"><i data-lucide="message-square"></i></div><div class="min-w-0 flex-1"><div class="flex justify-between gap-3 text-[12px] text-slate-500"><span>${esc(f.follower)} · ${esc(f.follow_up_method)}</span><span>${esc(f.followed_at)}</span></div><div class="mt-1 leading-5 text-slate-800 rich-content" data-html="${encodeURIComponent(f.content || '')}"></div>${f.next_action ? `<p class="mt-1 leading-5 text-blue-700">下一步：${text(f.next_action)}</p>` : ""}</div><button class="activity-delete" type="button" onclick="planDeleteFollowup(event, ${f.id})" title="删除评论"><i data-lucide="trash-2"></i></button></div>`).join("")
       : '<p class="text-sm text-slate-400 py-4 text-center">暂无跟进记录</p>';
     if (window.lucide) window.lucide.createIcons();
     list.querySelectorAll(".rich-content").forEach(el => {
@@ -748,8 +747,8 @@ async function loadFinFollowups(pfId) {
   } catch (e) { /* ignore */ }
 }
 
-function initFinSquire() {
-  const ed = document.querySelector("#squire_finance");
+function planInitSquire() {
+  const ed = document.querySelector("#plan_squire_finance");
   if (!ed || !window.Squire) return;
   if (window.squireInstances["squire_finance"]) { window.squireInstances["squire_finance"].destroy(); }
   const sq = new Squire(ed, { blockTag: "P" });
@@ -758,8 +757,8 @@ function initFinSquire() {
   ed.addEventListener("blur", () => { if (!ed.textContent.trim()) ed.classList.remove("focused"); });
 }
 
-window.submitFinComment = async () => {
-  const pfId = document.querySelector("#pf-id-input").value;
+window.planSubmitComment = async () => {
+  const pfId = document.querySelector("#plan_pf-id-input").value;
   if (!pfId) return;
   const sq = window.squireInstances["squire_finance"];
   const content = sq ? sq.getHTML().trim() : "";
@@ -771,22 +770,22 @@ window.submitFinComment = async () => {
   sq.setHTML("");
   btn.disabled = false;
   btn.textContent = "评论";
-  await loadFinFollowups(pfId);
+  await planLoadFollowups(pfId);
 };
 
-window.deleteFinFollowup = async (event, followupId) => {
+window.planDeleteFollowup = async (event, followupId) => {
   event.stopPropagation();
   if (!confirm("确认删除这条评论？")) return;
   await api(`/api/followups/${followupId}`, { method: "DELETE" });
-  const pfId = document.querySelector("#pf-id-input").value;
-  if (pfId) await loadFinFollowups(pfId);
+  const pfId = document.querySelector("#plan_pf-id-input").value;
+  if (pfId) await planLoadFollowups(pfId);
 };
 
-window.openPfEditModal = (pfId) => {
+window.planOpenPfEditModal = (pfId) => {
   const pf = (state.data.planFinances || []).find(x => x.id === pfId);
   if (!pf) return;
-  document.querySelector("#pf-id-input").value = pf.id;
-  document.querySelector("#financeModalTitle").textContent = "编辑项目财务";
+  document.querySelector("#plan_pf-id-input").value = pf.id;
+  document.querySelector("#planModalTitle").textContent = "编辑项目财务";
   document.querySelector("#planDeleteBtn").classList.remove("hidden");
   const form = document.querySelector("#financeModal form");
   form.querySelector('[name="project_id"]').value = pf.project_id || "";
@@ -813,7 +812,6 @@ window.openPfEditModal = (pfId) => {
     signMonthEl.innerHTML = monthOptions(signMonthValue);
     signMonthEl.value = signMonthValue;
   }
-  form.querySelector('[name="status"]').value = pf.status || "待签约";
   form.querySelector('[name="sales_person"]').value = pf.sales_person || "";
   form.querySelector('[name="owner"]').value = pf.owner || "";
   setVal("start_date", pf.start_date);
@@ -827,15 +825,15 @@ window.openPfEditModal = (pfId) => {
   setVal("other_info", pf.other_info);
   let budgetData = [];
   try { budgetData = JSON.parse(pf.budget_data || "[]"); } catch (e) { budgetData = []; }
-  initRevpayTable(budgetData.length ? budgetData : null);
+  planInitRevpayTable(budgetData.length ? budgetData : null);
   let expenseData = [];
   try { expenseData = JSON.parse(pf.expense_data || "[]"); } catch (e) { expenseData = []; }
-  initCostTable(expenseData.length ? expenseData : null);
+  planInitCostTable(expenseData.length ? expenseData : null);
   let taskData = [];
   try { taskData = JSON.parse(pf.task_data || "[]"); } catch (e) { taskData = []; }
-  initTaskTable(taskData.length ? taskData : null);
+  planInitTaskTable(taskData.length ? taskData : null);
   setTimeout(() => updateBudgetSummary(), 100);
-  loadFinFollowups(pf.id);
+  planLoadFollowups(pf.id);
   openPlanModal();
 };
 
@@ -936,8 +934,8 @@ window.createPlanFinance = async (event) => {
       if (result.id && data.customer_name) logActivity("finance", result.id, "创建了「" + data.customer_name + "」的财务项目");
     }
     form.reset();
-    document.querySelector("#pf-id-input").value = "";
-    document.querySelector("#financeModalTitle").textContent = "新增项目财务";
+    document.querySelector("#plan_pf-id-input").value = "";
+    document.querySelector("#planModalTitle").textContent = "新增项目财务";
     closePlanModal();
     await load();
   } catch (error) {
@@ -946,7 +944,7 @@ window.createPlanFinance = async (event) => {
 };
 
 window.deletePlanItem = async () => {
-  const pfId = document.querySelector("#pf-id-input").value;
+  const pfId = document.querySelector("#plan_pf-id-input").value;
   if (!pfId) return;
   const pf = (state.data.planFinances || []).find(x => x.id === parseInt(pfId));
   const name = pf ? (pf.customer_name || "此项目") : "此项目";

static/modules/utils.js

@@ -11,7 +11,7 @@ const state = {
   taskView: localStorage.getItem("opc-task-view") || "detail",
   finView: "overview",
   finSort: null, // { key: 'col', asc: true }
-  planFilter: "待签约",
+  planFilter: "projects",
   planView: "overview",
   planSort: null,
   proposalTab: "standard",

static/styles.css

@@ -96,26 +96,26 @@ body {
 }
 
 /* 详情弹窗固定高度，tab 切换不抖动 */
-#financeModal > div {
+#financeModal > div, #planModal > div {
   height: 650px;
   display: flex;
   flex-direction: column;
 }
-#financeModal .finance-tabs { flex-shrink: 0; }
-#financeModal form {
+#financeModal .finance-tabs, #planModal .finance-tabs { flex-shrink: 0; }
+#financeModal form, #planModal form {
   flex: 1;
   min-height: 0;
   display: flex;
   flex-direction: column;
   overflow: hidden;
 }
-#financeModal .finance-tab-body {
+#financeModal .finance-tab-body, #planModal .finance-tab-body {
   flex: 1;
   min-height: 0;
   overflow-y: auto;
   padding: 32px;
 }
-#financeModal .finance-form-actions {
+#financeModal .finance-form-actions, #planModal .finance-form-actions {
   flex-shrink: 0;
   background: #fff;
   padding: 12px 32px 8px;

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.19</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.22</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">