Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
e02c0bd183 | ||
|
|
853344fb26 | ||
|
|
386f780d00 | ||
|
|
dd0c7d615f | ||
|
|
289529dc73 | ||
|
|
19dcbdbb51 |
@@ -171,21 +171,54 @@ window.createProposal = (event) => createResource(event, "proposals");
|
|||||||
window.createOperation = (event) => createResource(event, "operations");
|
window.createOperation = (event) => createResource(event, "operations");
|
||||||
window.createProduct = (event) => createResource(event, "products");
|
window.createProduct = (event) => createResource(event, "products");
|
||||||
|
|
||||||
async function createTask(event, projectId) {
|
window.openTaskForm = (projectId, taskId) => {
|
||||||
|
const form = document.querySelector(`#task-form-${projectId}`);
|
||||||
|
form.classList.remove("hidden");
|
||||||
|
if (taskId === null) {
|
||||||
|
// new task
|
||||||
|
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-submit-btn-${projectId}`).textContent = "确认新增";
|
||||||
|
} else {
|
||||||
|
// edit task
|
||||||
|
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-submit-btn-${projectId}`).textContent = "保存修改";
|
||||||
|
}
|
||||||
|
form.scrollIntoView({ behavior: "smooth" });
|
||||||
|
};
|
||||||
|
|
||||||
|
window.submitTaskForm = async (event, projectId) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const form = event.currentTarget;
|
const form = event.currentTarget;
|
||||||
const data = Object.fromEntries(new FormData(form).entries());
|
const data = Object.fromEntries(new FormData(form).entries());
|
||||||
data.project_id = projectId;
|
data.project_id = projectId;
|
||||||
|
const taskId = data.task_id;
|
||||||
|
delete data.task_id;
|
||||||
try {
|
try {
|
||||||
await api("/api/tasks", { method: "POST", body: JSON.stringify({ data }) });
|
if (taskId) {
|
||||||
|
await api(`/api/tasks/${taskId}`, { method: "PUT", body: JSON.stringify({ data }) });
|
||||||
|
} else {
|
||||||
|
await api("/api/tasks", { method: "POST", body: JSON.stringify({ data }) });
|
||||||
|
}
|
||||||
form.reset();
|
form.reset();
|
||||||
form.classList.add("hidden");
|
form.classList.add("hidden");
|
||||||
await load();
|
await load();
|
||||||
showTaskModal(projectId);
|
showTaskModal(projectId);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
alert("创建失败：" + error.message);
|
alert("保存失败：" + error.message);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
window.createFinance = (event) => createResource(event, "finance");
|
window.createFinance = (event) => createResource(event, "finance");
|
||||||
window.switchTab = switchTab;
|
window.switchTab = switchTab;
|
||||||
|
|
||||||
@@ -224,23 +257,25 @@ function showTaskModal(projectId) {
|
|||||||
const project = state.data.operations.find((x) => x.id === projectId);
|
const project = state.data.operations.find((x) => x.id === projectId);
|
||||||
const tasks = (state.data.tasks || []).filter((t) => t.project_id === projectId);
|
const tasks = (state.data.tasks || []).filter((t) => t.project_id === projectId);
|
||||||
const phases = ["项目准备", "项目执行", "项目验收", "验收完毕"];
|
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(); document.querySelector('#task-form-${projectId}').classList.toggle('hidden')"><i data-lucide="plus"></i>新增任务</button><button class="task-close" onclick="closeTaskModal()"><i data-lucide="x"></i></button></div></div><div class="task-body">
|
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">
|
||||||
<form id="task-form-${projectId}" class="hidden task-form" onsubmit="createTask(event, ${projectId})">
|
<form id="task-form-${projectId}" class="hidden task-form" onsubmit="submitTaskForm(event, ${projectId})">
|
||||||
|
<input type="hidden" name="task_id" id="task-id-${projectId}" value="">
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
<label class="task-field"><span>任务名称</span><input name="task" required></label>
|
<label class="task-field"><span>任务名称</span><input name="task" required id="task-name-${projectId}"></label>
|
||||||
<label class="task-field"><span>任务阶段</span><select name="phase">${phases.map((p) => `<option>${p}</option>`).join("")}</select></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"></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"></label>
|
<label class="task-field"><span>截止时间</span><input name="due_date" type="date" id="task-due-${projectId}"></label>
|
||||||
<label class="task-field col-span-2"><span>任务说明</span><textarea name="notes" rows="2"></textarea></label>
|
<label class="task-field col-span-2"><span>任务说明</span><textarea name="notes" rows="2" id="task-notes-${projectId}"></textarea></label>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-end gap-2 mt-3">
|
<div class="flex justify-end gap-2 mt-3">
|
||||||
<button type="button" class="btn btn-ghost btn-sm" onclick="document.querySelector('#task-form-${projectId}').classList.add('hidden')">取消</button>
|
<button type="button" class="btn btn-ghost btn-sm" onclick="document.querySelector('#task-form-${projectId}').classList.add('hidden')">取消</button>
|
||||||
<button type="submit" class="btn btn-primary btn-sm">确认新增</button>
|
<button type="submit" class="btn btn-primary btn-sm" id="task-submit-btn-${projectId}">确认新增</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
${phases.map((phase) => {
|
${phases.map((phase) => {
|
||||||
const pt = tasks.filter((t) => t.phase === 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></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>` : ""}</div><span class="task-col">${t.owner || ""}</span><span class="task-col-badge">${t.due_date || ""}</span></div>`).join("")}</div></div>`;
|
||||||
}).join("")}</div></div></div>`;
|
}).join("")}</div></div></div>`;
|
||||||
document.querySelector("#taskModal").classList.add("active");
|
document.querySelector("#taskModal").classList.add("active");
|
||||||
if (window.lucide) window.lucide.createIcons();
|
if (window.lucide) window.lucide.createIcons();
|
||||||
|
|||||||
@@ -494,58 +494,64 @@ td {
|
|||||||
.task-modal { display: none; }
|
.task-modal { display: none; }
|
||||||
.task-modal.active { display: block; }
|
.task-modal.active { display: block; }
|
||||||
.task-overlay {
|
.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;
|
display: flex; align-items: flex-start; justify-content: center;
|
||||||
padding-top: 48px; overflow-y: auto;
|
padding-top: 48px; overflow-y: auto;
|
||||||
}
|
}
|
||||||
.task-panel {
|
.task-panel {
|
||||||
background: #18191c; border-radius: 12px; width: 600px; max-width: 92vw;
|
background: #fff; border-radius: 12px; width: 1000px; max-width: 96vw;
|
||||||
box-shadow: 0 24px 80px rgba(0,0,0,0.4); margin-bottom: 48px;
|
box-shadow: 0 20px 60px rgba(0,0,0,0.12); margin-bottom: 48px;
|
||||||
}
|
}
|
||||||
.task-header {
|
.task-header {
|
||||||
display: flex; align-items: center; justify-content: space-between;
|
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 {
|
.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;
|
padding: 4px; border-radius: 6px; display: flex;
|
||||||
}
|
}
|
||||||
.task-close:hover { color: #e4e5e7; background: #2a2d34; }
|
.task-close:hover { color: #475569; background: #f1f5f9; }
|
||||||
.task-body { padding: 20px; display: flex; flex-direction: column; gap: 16px; }
|
.task-body { padding: 20px; display: flex; flex-direction: column; gap: 16px; }
|
||||||
.task-group {
|
.task-group {
|
||||||
background: #1e2025; border-radius: 8px;
|
background: #fff; border-radius: 8px;
|
||||||
border: 1px solid #2a2d34; overflow: hidden;
|
border: 1px solid #e2e8f0; overflow: hidden;
|
||||||
}
|
}
|
||||||
.task-group-hd {
|
.task-group-hd {
|
||||||
display: flex; align-items: center; gap: 8px;
|
display: flex; align-items: center; gap: 8px;
|
||||||
padding: 10px 14px;
|
padding: 10px 16px; background: #f8fafc;
|
||||||
}
|
}
|
||||||
.task-group-icon { color: #6b6d75; display: flex; }
|
.task-group-icon { color: #64748b; display: flex; }
|
||||||
.task-group-label { color: #aeafb4; font-size: 13px; font-weight: 600; }
|
.task-group-label { color: #334155; font-size: 13px; font-weight: 600; }
|
||||||
.task-group-n {
|
.task-group-n {
|
||||||
background: #2a2d34; color: #6b6d75; font-size: 11px;
|
background: #e2e8f0; color: #64748b; font-size: 11px;
|
||||||
padding: 1px 7px; border-radius: 10px;
|
padding: 1px 7px; border-radius: 10px;
|
||||||
}
|
}
|
||||||
.task-group-list { display: flex; flex-direction: column; }
|
.task-group-list { display: flex; flex-direction: column; }
|
||||||
.task-row {
|
.task-row {
|
||||||
display: flex; align-items: center; gap: 10px;
|
display: flex; align-items: center; gap: 16px;
|
||||||
padding: 8px 14px; border-top: 1px solid #24272d;
|
padding: 10px 16px; border-top: 1px solid #f1f5f9;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
.task-dot { display: flex; color: #4b4d54; }
|
.task-row:hover { background: #f8fafc; }
|
||||||
.task-name { color: #c5c6ca; font-size: 13px; }
|
.task-dot { display: flex; color: #cbd5e1; flex-shrink: 0; }
|
||||||
.task-none { color: #4b4d54; font-size: 13px; padding: 12px 14px; text-align: center; border-top: 1px solid #24272d; }
|
.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-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 {
|
.task-form {
|
||||||
background: #141518; border: 1px solid #2a2d34; border-radius: 8px;
|
background: #f8fafc; border: 1px solid #e2e8f0; border-radius: 8px;
|
||||||
padding: 14px; margin-bottom: 16px;
|
padding: 14px; margin-bottom: 16px;
|
||||||
}
|
}
|
||||||
.task-field { display: flex; flex-direction: column; gap: 4px; }
|
.task-field { display: flex; flex-direction: column; gap: 4px; }
|
||||||
.task-field span { color: #6b6d75; font-size: 12px; }
|
.task-field span { color: #64748b; font-size: 12px; }
|
||||||
.task-field input, .task-field select, .task-field textarea {
|
.task-field input, .task-field select, .task-field textarea {
|
||||||
background: #1e2025; border: 1px solid #2a2d34; border-radius: 6px;
|
background: #fff; border: 1px solid #e2e8f0; border-radius: 6px;
|
||||||
color: #e4e5e7; font-size: 13px; padding: 6px 10px; outline: none;
|
color: #1e293b; font-size: 13px; padding: 6px 10px; outline: none;
|
||||||
}
|
}
|
||||||
.task-field input:focus, .task-field select:focus, .task-field textarea:focus { border-color: #4a6cf7; }
|
.task-field input:focus, .task-field select:focus, .task-field textarea:focus { border-color: #2563eb; }
|
||||||
.col-span-2 { grid-column: span 2; }
|
.col-span-2 { grid-column: span 2; }
|
||||||
.task-group-add {
|
.task-group-add {
|
||||||
display: block; width: 100%; padding: 10px; text-align: center;
|
display: block; width: 100%; padding: 10px; text-align: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user