Compare commits

..

14 Commits

Author SHA1 Message Date
mac
5af58c8faa v1.7.0 — 任务清单改为 Tab 内二级页面,不再使用独立弹窗 2026-06-16 11:15:55 +08:00
mac
b682427ea0 v1.6.1 — 去除重点项目顶部阶段筛选分类标签 2026-06-16 11:13:30 +08:00
mac
ec83bb5e22 v1.6.0 — 任务编辑改为右侧抽屉滑入,顶栏不再内嵌表单 2026-06-16 11:11:34 +08:00
mac
921afd198b v1.5.1 — 修复编辑任务后误删DOM导致只剩一条 2026-06-16 10:57:29 +08:00
mac
850ad340e5 v1.5.0 — 项目阶段改为6阶段:商务洽谈/系统上线/团队分工/项目交付/上线推广/结项验收 2026-06-16 10:54:55 +08:00
mac
cec3e3a2ad v1.4.1 — 任务表单增加「卡点&备注」字段,任务行显示卡点红色标记 2026-06-16 10:33:58 +08:00
mac
e02c0bd183 v1.4.0 — 任务面板统一亮色 + 点击任务可编辑 + 任务说明自动换行 2026-06-16 10:32:34 +08:00
mac
853344fb26 v1.3.9 — 任务面板加宽到1000px + 横向表格布局 + 空分组自动隐藏 2026-06-16 10:28:48 +08:00
mac
386f780d00 v1.3.8 — 任务行始终渲染负责人和日期 + 加emoji图标 + 提亮颜色 2026-06-16 10:26:13 +08:00
mac
dd0c7d615f v1.3.7 — 加宽任务面板到800px + 显示任务说明+负责人+截止时间 2026-06-16 10:04:34 +08:00
mac
289529dc73 v1.3.6 — 合并负责人与截止时间到同一标签显示 2026-06-16 09:44:40 +08:00
mac
19dcbdbb51 v1.3.5 — 任务行增加负责人和截止时间显示 2026-06-16 09:42:07 +08:00
mac
b1a82d27e3 v1.3.4 — 修复新增任务递归调用导致创建失败 2026-06-16 09:40:08 +08:00
mac
ac5f9f2de9 v1.3.3 — 任务浮层新增统一「新增任务」按钮+表单弹窗 2026-06-16 09:14:38 +08:00
2 changed files with 182 additions and 30 deletions

View File

@@ -2,6 +2,7 @@ const state = {
active: "home",
data: null,
opFilter: "all",
projectView: null,
chart: null,
chart2: null,
productPlatform: "all",
@@ -170,10 +171,64 @@ window.createSales = (event) => createResource(event, "sales");
window.createProposal = (event) => createResource(event, "proposals");
window.createOperation = (event) => createResource(event, "operations");
window.createProduct = (event) => createResource(event, "products");
window.openTaskForm = (projectId, taskId) => {
const drawer = document.querySelector(`#task-drawer-${projectId}`);
const titleEl = drawer.querySelector(".task-drawer-title");
if (taskId === null) {
document.querySelector(`#task-id-${projectId}`).value = "";
document.querySelector(`#task-name-${projectId}`).value = "";
document.querySelector(`#task-phase-${projectId}`).value = "商务洽谈";
document.querySelector(`#task-owner-${projectId}`).value = "";
document.querySelector(`#task-due-${projectId}`).value = "";
document.querySelector(`#task-notes-${projectId}`).value = "";
document.querySelector(`#task-blockers-${projectId}`).value = "";
document.querySelector(`#task-submit-btn-${projectId}`).textContent = "确认新增";
if (titleEl) titleEl.textContent = "新增任务";
} else {
const task = (state.data.tasks || []).find((t) => t.id === taskId);
if (!task) return;
document.querySelector(`#task-id-${projectId}`).value = task.id;
document.querySelector(`#task-name-${projectId}`).value = task.task || "";
document.querySelector(`#task-phase-${projectId}`).value = task.phase || "商务洽谈";
document.querySelector(`#task-owner-${projectId}`).value = task.owner || "";
document.querySelector(`#task-due-${projectId}`).value = task.due_date || "";
document.querySelector(`#task-notes-${projectId}`).value = task.notes || "";
document.querySelector(`#task-blockers-${projectId}`).value = task.blockers || "";
document.querySelector(`#task-submit-btn-${projectId}`).textContent = "保存修改";
if (titleEl) titleEl.textContent = "编辑任务";
}
drawer.classList.add("open");
};
window.closeTaskDrawer = (projectId) => {
document.querySelector(`#task-drawer-${projectId}`).classList.remove("open");
};
window.submitTaskForm = async (event, projectId) => {
event.preventDefault();
const data = Object.fromEntries(new FormData(event.currentTarget).entries());
data.project_id = Number(projectId);
const taskId = data.task_id;
delete data.task_id;
try {
if (taskId) {
await api(`/api/tasks/${taskId}`, { method: "PUT", body: JSON.stringify({ data }) });
} else {
await api("/api/tasks", { method: "POST", body: JSON.stringify({ data }) });
}
await load();
} catch (error) {
alert("保存失败:" + error.message);
}
};
window.createFinance = (event) => createResource(event, "finance");
window.switchTab = switchTab;
function renderProjects() {
// 二级页面:项目任务详情
if (state.projectView) {
return renderProjectTasks(state.projectView);
}
const items = state.data.operations;
const rows = items.map((x) => [
`<strong>${x.project_name}</strong>`,
@@ -181,13 +236,10 @@ function renderProjects() {
badge(x.current_stage || x.project_status),
x.expected_contract_amount ? money(x.expected_contract_amount) : "—",
text(x.owner || "—"),
`<button class="btn btn-ghost btn-sm text-blue-600" onclick="event.stopPropagation(); showTaskModal(${x.id})"><i data-lucide="eye"></i>查看</button>`
`<button class="btn btn-ghost btn-sm text-blue-600" onclick="event.stopPropagation(); state.projectView=${x.id}; renderProjects()"><i data-lucide="eye"></i>查看</button>`
]);
document.querySelector("#projects").innerHTML = `<div class="grid gap-4">
<div class="flex items-center justify-between">
<div class="flex gap-2">
${[["all","全部"],["项目准备","准备"],["项目执行","执行"],["项目验收","验收"],["验收完毕","完毕"]].map(([k,v]) => `<button class="btn ${state.opFilter === k ? "btn-primary" : "btn-ghost"} btn-sm" onclick="state.opFilter='${k}'; renderProjects()">${v}</button>`).join("")}
</div>
<div class="flex items-center justify-end">
<button class="btn btn-primary" onclick="document.querySelector('#project-form').classList.toggle('hidden')">
<i data-lucide="plus"></i>新增项目
</button>
@@ -195,7 +247,7 @@ function renderProjects() {
<div id="project-form" class="hidden">
${card(formHtml([
{ label: "项目名称", input: `<input name="project_name" required>` },
{ label: "当前阶段", input: `<select name="current_stage"><option>项目准备</option><option></option><option></option><option></option></select>` },
{ label: "当前阶段", input: `<select name="current_stage"><option>商务洽谈</option><option>线</option><option></option><option></option><option>线广</option><option></option></select>` },
{ label: "项目金额", input: `<input name="expected_contract_amount" type="number" step="0.01" placeholder="万元">` },
{ label: "负责人", input: `<input name="owner">` },
], { handler: "createOperation", text: "确认新增" }), "p-4")}
@@ -204,18 +256,84 @@ function renderProjects() {
</div>`;
}
function renderProjectTasks(projectId) {
const project = state.data.operations.find((x) => x.id === projectId);
if (!project) { state.projectView = null; renderProjects(); return; }
const tasks = (state.data.tasks || []).filter((t) => t.project_id === projectId);
const phases = ["商务洽谈", "系统上线", "团队分工", "项目交付", "上线推广", "结项验收"];
document.querySelector("#projects").innerHTML = `<div class="grid gap-4">
<div class="flex items-center justify-between">
<button class="btn btn-ghost btn-sm" onclick="state.projectView=null;renderProjects()"><i data-lucide="arrow-left"></i>返回项目列表</button>
<div class="flex items-center gap-3">
<span class="text-sm font-semibold text-slate-700">${project.project_name}</span>
<button class="btn btn-primary btn-sm" onclick="openTaskForm(${projectId}, null)"><i data-lucide="plus"></i>新增任务</button>
</div>
</div>
<div class="task-page-wrap">
<div class="task-body">
${phases.map((phase) => {
const pt = tasks.filter((t) => t.phase === phase);
if (!pt.length) return "";
return `<div class="task-group"><div class="task-group-hd"><span class="task-group-icon"><i data-lucide="layers"></i></span><span class="task-group-label">${phase}</span><span class="task-group-n">${pt.length}</span></div><div class="task-group-list">${pt.map((t) => `<div class="task-row" data-id="${t.id}" onclick="openTaskForm(${projectId}, ${t.id})"><span class="task-dot"><i data-lucide="${t.status === 'done' ? 'check-circle' : 'circle'}"></i></span><div class="task-main"><span class="task-name">${t.task}</span>${t.notes ? `<span class="task-desc">${t.notes}</span>` : ""}${t.blockers ? `<span class="task-blocker">⚠ ${t.blockers}</span>` : ""}</div><span class="task-col">${t.owner || ""}</span><span class="task-col-badge">${t.due_date || ""}</span></div>`).join("")}</div></div>`;
}).join("")}
</div>
<div id="task-drawer-${projectId}" class="task-drawer">
<div class="task-drawer-hd"><span class="task-drawer-title">编辑任务</span><button class="task-close" onclick="closeTaskDrawer(${projectId})"><i data-lucide="x"></i></button></div>
<form class="task-drawer-form" onsubmit="submitTaskForm(event, ${projectId})">
<input type="hidden" name="task_id" id="task-id-${projectId}" value="">
<label class="task-field"><span>任务名称</span><input name="task" required id="task-name-${projectId}"></label>
<label class="task-field"><span>任务阶段</span><select name="phase" id="task-phase-${projectId}">${phases.map((p) => `<option>${p}</option>`).join("")}</select></label>
<label class="task-field"><span>负责人</span><input name="owner" id="task-owner-${projectId}"></label>
<label class="task-field"><span>截止时间</span><input name="due_date" type="date" id="task-due-${projectId}"></label>
<label class="task-field"><span>任务说明</span><textarea name="notes" rows="3" id="task-notes-${projectId}"></textarea></label>
<label class="task-field"><span>卡点&备注</span><textarea name="blockers" rows="2" id="task-blockers-${projectId}" placeholder="风险卡点、依赖项等"></textarea></label>
<div class="flex justify-end gap-2 mt-4 pt-3 border-t border-slate-100">
<button type="button" class="btn btn-ghost btn-sm" onclick="closeTaskDrawer(${projectId})">取消</button>
<button type="submit" class="btn btn-primary btn-sm" id="task-submit-btn-${projectId}">确认新增</button>
</div>
</form>
</div>
</div>
</div>`;
if (window.lucide) window.lucide.createIcons();
}
function showTaskModal(projectId) {
const project = state.data.operations.find((x) => x.id === projectId);
const tasks = (state.data.tasks || []).filter((t) => t.project_id === projectId);
const phases = ["项目准备", "项目执行", "项目验收", "验收完毕"];
document.querySelector("#taskModal").innerHTML = `<div class="task-overlay" onclick="closeTaskModal()"><div class="task-panel" onclick="event.stopPropagation()"><div class="task-header"><h2 class="task-title">${project.project_name} · 任务清单</h2><button class="task-close" onclick="closeTaskModal()"><i data-lucide="x"></i></button></div><div class="task-body">${phases.map((phase) => {
const phases = ["商务洽谈", "系统上线", "团队分工", "项目交付", "上线推广", "结项验收"];
document.querySelector("#taskModal").innerHTML = `<div class="task-overlay" onclick="closeTaskModal()"><div class="task-panel" onclick="event.stopPropagation()"><div class="task-header"><h2 class="task-title">${project.project_name} · 任务清单</h2><div class="flex items-center gap-3"><button class="btn btn-primary btn-sm" onclick="event.stopPropagation(); openTaskForm(${projectId}, null)"><i data-lucide="plus"></i>新增任务</button><button class="task-close" onclick="closeTaskModal()"><i data-lucide="x"></i></button></div></div><div class="task-body-wrap">
<div class="task-body">
${phases.map((phase) => {
const pt = tasks.filter((t) => t.phase === phase);
return `<div class="task-group"><div class="task-group-hd"><span class="task-group-icon"><i data-lucide="layers"></i></span><span class="task-group-label">${phase}</span><span class="task-group-n">${pt.length}</span></div><div class="task-group-list">${pt.length ? pt.map((t) => `<div class="task-row" data-id="${t.id}"><span class="task-dot"><i data-lucide="${t.status === 'done' ? 'check-circle' : 'circle'}"></i></span><span class="task-name">${t.task}</span></div>`).join("") : `<div class="task-none">暂无任务</div>`}</div><button class="task-group-add" onclick="event.stopPropagation()">+ 添加任务</button></div>`;
}).join("")}</div></div></div>`;
if (!pt.length) return "";
return `<div class="task-group"><div class="task-group-hd"><span class="task-group-icon"><i data-lucide="layers"></i></span><span class="task-group-label">${phase}</span><span class="task-group-n">${pt.length}</span></div><div class="task-group-list">${pt.map((t) => `<div class="task-row" data-id="${t.id}" onclick="event.stopPropagation(); openTaskForm(${projectId}, ${t.id})"><span class="task-dot"><i data-lucide="${t.status === 'done' ? 'check-circle' : 'circle'}"></i></span><div class="task-main"><span class="task-name">${t.task}</span>${t.notes ? `<span class="task-desc">${t.notes}</span>` : ""}${t.blockers ? `<span class="task-blocker">⚠ ${t.blockers}</span>` : ""}</div><span class="task-col">${t.owner || ""}</span><span class="task-col-badge">${t.due_date || ""}</span></div>`).join("")}</div></div>`;
}).join("")}
</div>
<div id="task-drawer-${projectId}" class="task-drawer">
<div class="task-drawer-hd"><span class="task-drawer-title">编辑任务</span><button class="task-close" onclick="closeTaskDrawer(${projectId})"><i data-lucide="x"></i></button></div>
<form class="task-drawer-form" onsubmit="submitTaskForm(event, ${projectId})">
<input type="hidden" name="task_id" id="task-id-${projectId}" value="">
<label class="task-field"><span>任务名称</span><input name="task" required id="task-name-${projectId}"></label>
<label class="task-field"><span>任务阶段</span><select name="phase" id="task-phase-${projectId}">${phases.map((p) => `<option>${p}</option>`).join("")}</select></label>
<label class="task-field"><span>负责人</span><input name="owner" id="task-owner-${projectId}"></label>
<label class="task-field"><span>截止时间</span><input name="due_date" type="date" id="task-due-${projectId}"></label>
<label class="task-field"><span>任务说明</span><textarea name="notes" rows="3" id="task-notes-${projectId}"></textarea></label>
<label class="task-field"><span>卡点&备注</span><textarea name="blockers" rows="2" id="task-blockers-${projectId}" placeholder="风险卡点、依赖项等"></textarea></label>
<div class="flex justify-end gap-2 mt-4 pt-3 border-t border-slate-100">
<button type="button" class="btn btn-ghost btn-sm" onclick="closeTaskDrawer(${projectId})">取消</button>
<button type="submit" class="btn btn-primary btn-sm" id="task-submit-btn-${projectId}">确认新增</button>
</div>
</form>
</div>
</div></div></div>`;
document.querySelector("#taskModal").classList.add("active");
if (window.lucide) window.lucide.createIcons();
}
window.closeTaskModal = () => document.querySelector("#taskModal").classList.remove("active");
window.closeTaskModal = () => {
document.querySelector("#taskModal").classList.remove("active");
document.querySelector("#taskModal").innerHTML = "";
};
function renderProposals() {
const proposalRows = state.data.proposals.map((p) => [p.customer_or_project_name, p.version, badge(p.status), p.files.length + " 个"]);

View File

@@ -494,47 +494,81 @@ td {
.task-modal { display: none; }
.task-modal.active { display: block; }
.task-overlay {
position: fixed; inset: 0; background: rgba(10,12,16,0.5); z-index: 200;
position: fixed; inset: 0; background: rgba(15,23,42,0.35); z-index: 200;
display: flex; align-items: flex-start; justify-content: center;
padding-top: 48px; overflow-y: auto;
}
.task-panel {
background: #18191c; border-radius: 12px; width: 600px; max-width: 92vw;
box-shadow: 0 24px 80px rgba(0,0,0,0.4); margin-bottom: 48px;
background: #fff; border-radius: 12px; width: 1000px; max-width: 96vw;
box-shadow: 0 20px 60px rgba(0,0,0,0.12); margin-bottom: 48px;
overflow: hidden;
}
.task-header {
display: flex; align-items: center; justify-content: space-between;
padding: 16px 20px; border-bottom: 1px solid #2a2d34;
padding: 16px 20px; border-bottom: 1px solid #e2e8f0;
}
.task-title { color: #e4e5e7; font-size: 15px; font-weight: 600; }
.task-title { color: #1e293b; font-size: 15px; font-weight: 600; }
.task-close {
color: #6b6d75; background: none; border: none; cursor: pointer;
color: #94a3b8; background: none; border: none; cursor: pointer;
padding: 4px; border-radius: 6px; display: flex;
}
.task-close:hover { color: #e4e5e7; background: #2a2d34; }
.task-body { padding: 20px; display: flex; flex-direction: column; gap: 16px; }
.task-close:hover { color: #475569; background: #f1f5f9; }
.task-body-wrap, .task-page-wrap { position: relative; overflow: hidden; }
.task-body { padding: 20px; display: flex; flex-direction: column; gap: 16px; transition: margin-right 0.25s ease; }
.task-drawer {
position: absolute; top: 0; right: 0; width: 420px; height: 100%;
background: #fff; border-left: 1px solid #e2e8f0;
transform: translateX(100%); transition: transform 0.25s ease;
z-index: 10; display: flex; flex-direction: column;
}
.task-drawer.open { transform: translateX(0); }
.task-drawer-hd {
display: flex; align-items: center; justify-content: space-between;
padding: 14px 20px; border-bottom: 1px solid #e2e8f0;
}
.task-drawer-title { font-size: 15px; font-weight: 600; color: #1e293b; }
.task-drawer-form { padding: 16px 20px; flex: 1; overflow-y: auto; display: flex; flex-direction: column; gap: 14px; }
.task-group {
background: #1e2025; border-radius: 8px;
border: 1px solid #2a2d34; overflow: hidden;
background: #fff; border-radius: 8px;
border: 1px solid #e2e8f0; overflow: hidden;
}
.task-group-hd {
display: flex; align-items: center; gap: 8px;
padding: 10px 14px;
padding: 10px 16px; background: #f8fafc;
}
.task-group-icon { color: #6b6d75; display: flex; }
.task-group-label { color: #aeafb4; font-size: 13px; font-weight: 600; }
.task-group-icon { color: #64748b; display: flex; }
.task-group-label { color: #334155; font-size: 13px; font-weight: 600; }
.task-group-n {
background: #2a2d34; color: #6b6d75; font-size: 11px;
background: #e2e8f0; color: #64748b; font-size: 11px;
padding: 1px 7px; border-radius: 10px;
}
.task-group-list { display: flex; flex-direction: column; }
.task-row {
display: flex; align-items: center; gap: 10px;
padding: 8px 14px; border-top: 1px solid #24272d;
display: flex; align-items: center; gap: 16px;
padding: 10px 16px; border-top: 1px solid #f1f5f9;
cursor: pointer;
}
.task-dot { display: flex; color: #4b4d54; }
.task-name { color: #c5c6ca; font-size: 13px; }
.task-none { color: #4b4d54; font-size: 13px; padding: 12px 14px; text-align: center; border-top: 1px solid #24272d; }
.task-row:hover { background: #f8fafc; }
.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; }
.task-main { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
.task-name { color: #1e293b; font-size: 13px; }
.task-desc { color: #94a3b8; font-size: 12px; word-wrap: break-word; overflow-wrap: break-word; }
.task-blocker { color: #dc2626; font-size: 12px; word-wrap: break-word; overflow-wrap: break-word; }
.task-col { color: #64748b; font-size: 12px; white-space: nowrap; width: 100px; text-align: right; }
.task-col-badge { color: #64748b; font-size: 12px; white-space: nowrap; width: 90px; text-align: right; }
.task-none { color: #94a3b8; font-size: 13px; padding: 12px 14px; text-align: center; border-top: 1px solid #f1f5f9; }
.task-form {
background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px;
padding: 14px; margin-bottom: 16px;
}
.task-field { display: flex; flex-direction: column; gap: 4px; }
.task-field span { color: #64748b; font-size: 12px; }
.task-field input, .task-field select, .task-field textarea {
background: #fff; border: 1px solid #e2e8f0; border-radius: 6px;
color: #1e293b; font-size: 13px; padding: 6px 10px; outline: none;
}
.task-field input:focus, .task-field select:focus, .task-field textarea:focus { border-color: #2563eb; }
.col-span-2 { grid-column: span 2; }
.task-group-add {
display: block; width: 100%; padding: 10px; text-align: center;
color: #6b6d75; font-size: 13px; background: none; border: none;