Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
76da3a2106 | ||
|
|
e7e93c06f8 | ||
|
|
f9fe32beed |
@@ -17,7 +17,7 @@ def run_migrations():
|
|||||||
"""
|
"""
|
||||||
from migrations.tables import migrate_create_tables
|
from migrations.tables import migrate_create_tables
|
||||||
from migrations.columns import migrate_add_columns
|
from migrations.columns import migrate_add_columns
|
||||||
from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard
|
from migrations.data_fixes import migrate_fix_task_status, migrate_rename_tenant, migrate_drop_product_fields, migrate_fix_service_fee_standard, migrate_fix_expense_status
|
||||||
from migrations.data_split import migrate_data_split
|
from migrations.data_split import migrate_data_split
|
||||||
from migrations.seed import migrate_seed_users, migrate_seed_demo_data
|
from migrations.seed import migrate_seed_users, migrate_seed_demo_data
|
||||||
|
|
||||||
@@ -27,6 +27,7 @@ def run_migrations():
|
|||||||
migrate_rename_tenant()
|
migrate_rename_tenant()
|
||||||
migrate_drop_product_fields()
|
migrate_drop_product_fields()
|
||||||
migrate_fix_service_fee_standard()
|
migrate_fix_service_fee_standard()
|
||||||
|
migrate_fix_expense_status()
|
||||||
migrate_data_split()
|
migrate_data_split()
|
||||||
migrate_seed_users()
|
migrate_seed_users()
|
||||||
migrate_seed_demo_data()
|
migrate_seed_demo_data()
|
||||||
|
|||||||
@@ -105,6 +105,8 @@ def migrate_add_columns():
|
|||||||
"ALTER TABLE expense_records ADD COLUMN expense_month VARCHAR(20) NOT NULL DEFAULT ''")
|
"ALTER TABLE expense_records ADD COLUMN expense_month VARCHAR(20) NOT NULL DEFAULT ''")
|
||||||
_add_column_if_missing(conn, "expense_records", "incurred_amount",
|
_add_column_if_missing(conn, "expense_records", "incurred_amount",
|
||||||
"ALTER TABLE expense_records ADD COLUMN incurred_amount DOUBLE NOT NULL DEFAULT 0")
|
"ALTER TABLE expense_records ADD COLUMN incurred_amount DOUBLE NOT NULL DEFAULT 0")
|
||||||
|
_add_column_if_missing(conn, "expense_records", "status",
|
||||||
|
"ALTER TABLE expense_records ADD COLUMN status VARCHAR(50) NOT NULL DEFAULT '计入费用'")
|
||||||
|
|
||||||
# project_finances 费用明细 JSON 数据
|
# project_finances 费用明细 JSON 数据
|
||||||
_add_column_if_missing(conn, "project_finances", "expense_data",
|
_add_column_if_missing(conn, "project_finances", "expense_data",
|
||||||
|
|||||||
@@ -92,3 +92,23 @@ def migrate_fix_service_fee_standard():
|
|||||||
print(f"[migrate] project_finances: {affected} 条记录 service_fee_standard 修正为 5")
|
print(f"[migrate] project_finances: {affected} 条记录 service_fee_standard 修正为 5")
|
||||||
finally:
|
finally:
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
|
|
||||||
|
def migrate_fix_expense_status():
|
||||||
|
"""修正 expense_records 中空的 status 为默认值「计入费用」"""
|
||||||
|
from db import db
|
||||||
|
|
||||||
|
conn = db()
|
||||||
|
try:
|
||||||
|
cur = conn.cursor()
|
||||||
|
cur.execute(
|
||||||
|
"UPDATE expense_records SET status='计入费用' "
|
||||||
|
"WHERE status IS NULL OR status='' OR status='待审批'"
|
||||||
|
)
|
||||||
|
affected = cur.rowcount
|
||||||
|
cur.close()
|
||||||
|
if affected:
|
||||||
|
conn.commit()
|
||||||
|
print(f"[migrate] expense_records: {affected} 条记录 status 修正为 '计入费用'")
|
||||||
|
finally:
|
||||||
|
conn.close()
|
||||||
|
|||||||
@@ -224,11 +224,12 @@ def seed_db():
|
|||||||
incurred = int(amount * random.uniform(0.5, 1.0))
|
incurred = int(amount * random.uniform(0.5, 1.0))
|
||||||
_exec(conn, """
|
_exec(conn, """
|
||||||
INSERT INTO expense_records
|
INSERT INTO expense_records
|
||||||
(tenant, expense_type, expense_month, amount, incurred_amount, notes)
|
(tenant, expense_type, expense_month, amount, incurred_amount, notes, status)
|
||||||
VALUES (?,?,?,?,?,?)
|
VALUES (?,?,?,?,?,?,?)
|
||||||
""", (
|
""", (
|
||||||
tenant, et, month_str, amount, incurred,
|
tenant, et, month_str, amount, incurred,
|
||||||
f"{et} - {random.choice(['季度预算', '紧急支出', '常规费用', '项目费用'])}",
|
f"{et} - {random.choice(['季度预算', '紧急支出', '常规费用', '项目费用'])}",
|
||||||
|
"计入费用",
|
||||||
))
|
))
|
||||||
|
|
||||||
print(f"[seed] {tenant}: {len(amounts)} 项目, {op_count} 运营项目, {expense_count} 费用记录")
|
print(f"[seed] {tenant}: {len(amounts)} 项目, {op_count} 运营项目, {expense_count} 费用记录")
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ TABLES = {
|
|||||||
"finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes", "tenant"]),
|
"finance": ("finance_records", ["month", "project_name", "record_type", "category", "amount", "occurred_date", "notes", "tenant"]),
|
||||||
"tasks": ("project_tasks", ["project_id", "phase", "milestone", "task", "owner", "due_date", "blockers", "notes", "status", "sort_order", "priority", "tenant"]),
|
"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"]),
|
"projectFinances": ("project_finances", ["project_id", "tenant", "business_type", "customer_name", "sign_amount", "sign_month", "status", "sales_person", "owner", "total_rev", "total_gross", "total_payment", "total_cost", "total_paid", "budget_data", "expense_data", "start_date", "end_date", "task_type", "task_count", "service_fee_standard", "project_manager", "task_data", "project_code", "contact_name", "contact_phone", "other_info"]),
|
||||||
"expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "tenant"]),
|
"expense": ("expense_records", ["expense_type", "expense_month", "amount", "incurred_amount", "notes", "status", "tenant"]),
|
||||||
}
|
}
|
||||||
|
|
||||||
# ---------- 鉴权装饰器 ----------
|
# ---------- 鉴权装饰器 ----------
|
||||||
@@ -331,6 +331,7 @@ def bootstrap():
|
|||||||
def t_expense_sum(m_range):
|
def t_expense_sum(m_range):
|
||||||
total = 0
|
total = 0
|
||||||
for r in t_expense:
|
for r in t_expense:
|
||||||
|
if (r.get("status") or "") == "暂不计入": continue
|
||||||
m = (r.get("expense_month") or "").strip()
|
m = (r.get("expense_month") or "").strip()
|
||||||
if not m or "-" not in m: continue
|
if not m or "-" not in m: continue
|
||||||
try:
|
try:
|
||||||
@@ -459,6 +460,7 @@ def bootstrap():
|
|||||||
def expense_sum(month_range):
|
def expense_sum(month_range):
|
||||||
total = 0
|
total = 0
|
||||||
for r in expense:
|
for r in expense:
|
||||||
|
if (r.get("status") or "") == "暂不计入": continue
|
||||||
m = (r.get("expense_month") or "").strip()
|
m = (r.get("expense_month") or "").strip()
|
||||||
if not m or "-" not in m: continue
|
if not m or "-" not in m: continue
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -5,6 +5,12 @@ function renderExpense() {
|
|||||||
var money = function(v) { return '¥ ' + (Number(v || 0)).toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 }); };
|
var money = function(v) { return '¥ ' + (Number(v || 0)).toLocaleString('zh-CN', { minimumFractionDigits: 0, maximumFractionDigits: 2 }); };
|
||||||
var esc = function(s) { return (s || '').replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"'); };
|
var esc = function(s) { return (s || '').replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"'); };
|
||||||
var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
|
var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
|
||||||
|
var STATUS_OPTIONS = ['计入费用','暂不计入'];
|
||||||
|
|
||||||
|
// 排序状态
|
||||||
|
if (!state.expenseSort) state.expenseSort = { key: 'expense_month', asc: true };
|
||||||
|
var sortKey = state.expenseSort.key;
|
||||||
|
var sortAsc = state.expenseSort.asc ? 1 : -1;
|
||||||
|
|
||||||
// 筛选状态
|
// 筛选状态
|
||||||
var view = state.expenseView || 'total';
|
var view = state.expenseView || 'total';
|
||||||
@@ -35,30 +41,41 @@ function renderExpense() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 排序
|
||||||
|
filtered.sort(function(a, b) {
|
||||||
|
var va = a[sortKey] || '', vb = b[sortKey] || '';
|
||||||
|
if (sortKey === 'amount' || sortKey === 'incurred_amount') {
|
||||||
|
va = parseFloat(va) || 0; vb = parseFloat(vb) || 0;
|
||||||
|
}
|
||||||
|
if (va < vb) return -1 * sortAsc;
|
||||||
|
if (va > vb) return 1 * sortAsc;
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
|
|
||||||
var totalAmount = filtered.reduce(function(s, r) { return s + (r.amount || 0); }, 0);
|
var totalAmount = filtered.reduce(function(s, r) { return s + (r.amount || 0); }, 0);
|
||||||
var totalIncurred = filtered.reduce(function(s, r) { return s + (r.incurred_amount || 0); }, 0);
|
var totalIncurred = filtered.reduce(function(s, r) { return s + (r.incurred_amount || 0); }, 0);
|
||||||
|
|
||||||
// 月份下拉选项(去年/今年/明年)
|
// 月份下拉选项(去年/今年/明年)
|
||||||
var monthOpts = '<option value="">请选择</option>';
|
var monthOpts = '';
|
||||||
for (var yr = thisYear - 1; yr <= thisYear + 1; yr++)
|
for (var yr = thisYear - 1; yr <= thisYear + 1; yr++)
|
||||||
for (var m = 1; m <= 12; m++) {
|
for (var m = 1; m <= 12; m++) {
|
||||||
var mv = yr + '-' + String(m).padStart(2, '0');
|
var mv = yr + '-' + String(m).padStart(2, '0');
|
||||||
monthOpts += '<option value="' + mv + '"' + (mv === state.expenseMonth ? ' selected' : '') + '>' + mv + '</option>';
|
monthOpts += '<option value="' + mv + '">' + mv + '</option>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 季度下拉
|
// 季度下拉
|
||||||
var qLabels = ['Q1 (1-3月)','Q2 (4-6月)','Q3 (7-9月)','Q4 (10-12月)'];
|
var qLabels = ['Q1 (1-3月)','Q2 (4-6月)','Q3 (7-9月)','Q4 (10-12月)'];
|
||||||
var quarterOpts = '';
|
var quarterOpts = '';
|
||||||
for (var qi = 0; qi < 4; qi++) {
|
for (var qi = 0; qi < 4; qi++) {
|
||||||
quarterOpts += '<option value="' + qi + '"' + (String(qi) === state.expenseQuarter ? ' selected' : '') + '>' + qLabels[qi] + '</option>';
|
quarterOpts += '<option value="' + qi + '">' + qLabels[qi] + '</option>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 月份/季度日期选择器
|
// 月份/季度日期选择器
|
||||||
var dateSelect = '';
|
var dateSelect = '';
|
||||||
if (view === 'monthly') {
|
if (view === 'monthly') {
|
||||||
dateSelect = '<span class="text-sm text-slate-500 ml-2">月份:</span><select onchange="setExpenseMonth(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url('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') no-repeat right 4px center;padding-right:22px;min-height:30px">' + monthOpts + '</select>';
|
dateSelect = '<span class="text-sm text-slate-500 ml-2">月份:</span><select onchange="setExpenseMonth(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url('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') no-repeat right 4px center;padding-right:22px;min-height:30px"><option value=""' + (!state.expenseMonth?' selected':'') + '>请选择</option>' + monthOpts.replace('value="' + state.expenseMonth + '"', 'value="' + state.expenseMonth + '" selected') + '</select>';
|
||||||
} else if (view === 'quarterly') {
|
} else if (view === 'quarterly') {
|
||||||
dateSelect = '<span class="text-sm text-slate-500 ml-2">季度:</span><select onchange="setExpenseQuarter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url('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') no-repeat right 4px center;padding-right:22px;min-height:30px">' + quarterOpts + '</select>';
|
dateSelect = '<span class="text-sm text-slate-500 ml-2">季度:</span><select onchange="setExpenseQuarter(this.value)" class="text-sm font-medium py-1 px-2.5 cursor-pointer" style="appearance:none;-webkit-appearance:none;background-color:transparent;border:0;outline:none;background:url('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') no-repeat right 4px center;padding-right:22px;min-height:30px">' + quarterOpts.replace('value="' + state.expenseQuarter + '"', 'value="' + state.expenseQuarter + '" selected') + '</select>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
@@ -68,21 +85,36 @@ function renderExpense() {
|
|||||||
});
|
});
|
||||||
toolbar += '</select>' + dateSelect;
|
toolbar += '</select>' + dateSelect;
|
||||||
|
|
||||||
|
// 排序箭头
|
||||||
|
var sortArrow = function(key) {
|
||||||
|
var arrow = key === sortKey ? (sortAsc === 1 ? ' ↑' : ' ↓') : '';
|
||||||
|
return '<span class="text-slate-400 text-xs cursor-pointer" onclick="toggleExpenseSort(\'' + key + '\')">' + arrow + '</span>';
|
||||||
|
};
|
||||||
|
|
||||||
// 表格行
|
// 表格行
|
||||||
var tableRows = '';
|
var tableRows = '';
|
||||||
if (filtered.length) {
|
if (filtered.length) {
|
||||||
filtered.forEach(function(r) {
|
filtered.forEach(function(r) {
|
||||||
tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(' + r.id + ')"><td class="p-2 font-medium text-center align-middle" style="width:200px">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle" style="width:200px">' + (r.expense_month || '—') + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium" style="width:200px">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500" style="width:200px">' + (esc(r.notes) || '—') + '</td></tr>';
|
var statusCls = r.status === '暂不计入' ? 'text-amber-600' : 'text-green-600';
|
||||||
|
tableRows += '<tr class="border-b border-slate-100 hover:bg-slate-50 cursor-pointer" onclick="openExpenseEdit(' + r.id + ')"><td class="p-2 text-center align-middle font-medium">' + (r.expense_month || '—') + '</td><td class="p-2 font-medium text-center align-middle">' + esc(r.expense_type) + '</td><td class="p-2 text-center align-middle font-semibold ' + statusCls + '">' + esc(r.status || '计入费用') + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.amount) + '</td><td class="p-2 text-center align-middle font-medium">' + money(r.incurred_amount) + '</td><td class="p-2 text-center align-middle text-slate-500">' + (esc(r.notes) || '—') + '</td></tr>';
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
var emptyMsg = view === 'monthly' ? '该月份暂无费用记录' : view === 'quarterly' ? '该季度暂无费用记录' : '暂无费用记录';
|
var emptyMsg = view === 'monthly' ? '该月份暂无费用记录' : view === 'quarterly' ? '该季度暂无费用记录' : '暂无费用记录';
|
||||||
tableRows = '<tr><td colspan="5" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
|
tableRows = '<tr><td colspan="6" class="p-6 text-center text-slate-400">' + emptyMsg + '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// 模态框
|
// 模态框 monthOpts for form (with current value preselected)
|
||||||
|
var modalMonthOpts = '<option value="">请选择</option>';
|
||||||
|
for (var yr2 = thisYear - 1; yr2 <= thisYear + 1; yr2++)
|
||||||
|
for (var m2 = 1; m2 <= 12; m2++) {
|
||||||
|
var mv2 = yr2 + '-' + String(m2).padStart(2, '0');
|
||||||
|
modalMonthOpts += '<option value="' + mv2 + '">' + mv2 + '</option>';
|
||||||
|
}
|
||||||
|
var statusOpts = STATUS_OPTIONS.map(function(s) { return '<option value="' + s + '">' + s + '</option>'; }).join('');
|
||||||
|
|
||||||
var modal = '<div id="expenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeExpenseModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="expenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="expenseDeleteBtn" onclick="deleteExpenseItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
|
var modal = '<div id="expenseModal" class="hidden fixed inset-0 z-50 flex items-center justify-center bg-black/40" onclick="closeExpenseModal()"><div class="bg-white rounded-2xl shadow-2xl w-full max-w-lg mx-4" onclick="event.stopPropagation()"><div class="sticky top-0 z-10 bg-white/95 backdrop-blur border-b border-slate-100 px-6 py-4 flex items-center justify-between"><h3 class="text-lg font-bold text-slate-800" id="expenseModalTitle">新增费用</h3><div class="flex items-center gap-2"><button class="btn btn-ghost btn-sm text-red-600 hidden" id="expenseDeleteBtn" onclick="deleteExpenseItem()">删除</button><button class="btn btn-ghost btn-sm rounded-full w-8 h-8 p-0" onclick="closeExpenseModal()"><i data-lucide="x"></i></button></div></div><form onsubmit="saveExpense(event)" class="p-6 grid gap-4" novalidate><input type="hidden" name="expense_id" value=""><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用类型 <span class="text-red-500">*</span></span><select name="expense_type" required class="form-ctrl bg-white"><option value="">请选择</option>';
|
||||||
EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
|
EXPENSE_TYPES.forEach(function(t) { modal += '<option>' + t + '</option>'; });
|
||||||
modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + monthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">金额(元)</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生金额(元)</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeExpenseModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
|
modal += '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">月份 <span class="text-red-500">*</span></span><select name="expense_month" required class="form-ctrl bg-white">' + modalMonthOpts + '</select></label></div><div class="grid grid-cols-2 gap-3"><label class="block"><span class="text-sm text-slate-500 mb-1 block">金额(元)</span><input name="amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">已发生金额(元)</span><input name="incurred_amount" type="number" step="0.01" class="form-ctrl" placeholder="0.00"></label></div><label class="block"><span class="text-sm text-slate-500 mb-1 block">状态</span><select name="status" class="form-ctrl bg-white">' + statusOpts + '</select></label><label class="block"><span class="text-sm text-slate-500 mb-1 block">费用说明</span><textarea name="notes" class="form-ctrl" rows="3" placeholder="备注信息"></textarea></label><div class="flex justify-end gap-3 pt-2"><button type="button" class="btn btn-ghost btn-sm px-6" onclick="closeExpenseModal()">取消</button><button type="submit" class="btn btn-primary btn-sm px-8">保存</button></div></form></div></div>';
|
||||||
|
|
||||||
var target = document.querySelector("#financeExpense") || document.querySelector("#financeTabExpense") || document.querySelector("#expense");
|
var target = document.querySelector("#financeExpense") || document.querySelector("#financeTabExpense") || document.querySelector("#expense");
|
||||||
if (!target) return;
|
if (!target) return;
|
||||||
@@ -94,12 +126,20 @@ function renderExpense() {
|
|||||||
'<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
|
'<div class="metric-card p-3"><span class="flex items-center gap-2 text-sm text-slate-500">已发生金额</span><strong class="mt-2 block text-xl">' + money(totalIncurred) + '</strong></div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
modal +
|
modal +
|
||||||
'<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold" style="width:200px">费用类型</th><th class="p-2 text-center font-semibold" style="width:200px">月份</th><th class="p-2 text-center font-semibold" style="width:200px">金额</th><th class="p-2 text-center font-semibold" style="width:200px">已发生金额</th><th class="p-2 text-center font-semibold" style="width:200px">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
|
'<div class="card p-4"><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="bg-slate-50 border-b border-slate-200"><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'expense_month\')">月份' + sortArrow('expense_month') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'expense_type\')">费用类型' + sortArrow('expense_type') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'status\')">状态' + sortArrow('status') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'amount\')">金额' + sortArrow('amount') + '</th><th class="p-2 text-center font-semibold cursor-pointer select-none" onclick="toggleExpenseSort(\'incurred_amount\')">已发生金额' + sortArrow('incurred_amount') + '</th><th class="p-2 text-center font-semibold">费用说明</th></tr></thead><tbody>' + tableRows + '</tbody></table></div></div>' +
|
||||||
'</div>';
|
'</div>';
|
||||||
|
|
||||||
if (window.lucide) window.lucide.createIcons();
|
if (window.lucide) window.lucide.createIcons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
window.toggleExpenseSort = function(key) {
|
||||||
|
var cur = state.expenseSort || {};
|
||||||
|
if (cur.key === key) { cur.asc = !cur.asc; }
|
||||||
|
else { cur.key = key; cur.asc = true; }
|
||||||
|
state.expenseSort = cur;
|
||||||
|
renderExpense();
|
||||||
|
};
|
||||||
|
|
||||||
window.setExpenseView = function(v) { state.expenseView = v; renderExpense(); };
|
window.setExpenseView = function(v) { state.expenseView = v; renderExpense(); };
|
||||||
window.setExpenseFilter = function(v) { state.expenseFilter = v; renderExpense(); };
|
window.setExpenseFilter = function(v) { state.expenseFilter = v; renderExpense(); };
|
||||||
window.setExpenseMonth = function(v) { state.expenseMonth = v; renderExpense(); };
|
window.setExpenseMonth = function(v) { state.expenseMonth = v; renderExpense(); };
|
||||||
@@ -109,6 +149,7 @@ window.openExpenseModal = function() {
|
|||||||
var form = document.querySelector("#expenseModal form");
|
var form = document.querySelector("#expenseModal form");
|
||||||
form.reset();
|
form.reset();
|
||||||
form.querySelector('[name="expense_id"]').value = "";
|
form.querySelector('[name="expense_id"]').value = "";
|
||||||
|
form.querySelector('[name="status"]').value = "计入费用";
|
||||||
document.querySelector("#expenseModalTitle").textContent = "新增费用";
|
document.querySelector("#expenseModalTitle").textContent = "新增费用";
|
||||||
document.querySelector("#expenseDeleteBtn").classList.add("hidden");
|
document.querySelector("#expenseDeleteBtn").classList.add("hidden");
|
||||||
document.querySelector("#expenseModal").classList.remove("hidden");
|
document.querySelector("#expenseModal").classList.remove("hidden");
|
||||||
@@ -130,6 +171,7 @@ window.openExpenseEdit = function(id) {
|
|||||||
setVal("amount", r.amount);
|
setVal("amount", r.amount);
|
||||||
setVal("incurred_amount", r.incurred_amount);
|
setVal("incurred_amount", r.incurred_amount);
|
||||||
setVal("notes", r.notes);
|
setVal("notes", r.notes);
|
||||||
|
setVal("status", r.status || "计入费用");
|
||||||
document.querySelector("#expenseModalTitle").textContent = "编辑费用";
|
document.querySelector("#expenseModalTitle").textContent = "编辑费用";
|
||||||
document.querySelector("#expenseDeleteBtn").classList.remove("hidden");
|
document.querySelector("#expenseDeleteBtn").classList.remove("hidden");
|
||||||
document.querySelector("#expenseModal").classList.remove("hidden");
|
document.querySelector("#expenseModal").classList.remove("hidden");
|
||||||
@@ -139,9 +181,9 @@ window.saveExpense = async function(event) {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
var form = event.target;
|
var form = event.target;
|
||||||
var data = Object.fromEntries(new FormData(form).entries());
|
var data = Object.fromEntries(new FormData(form).entries());
|
||||||
// 数字字段空值转 0,避免线上 MySQL 严格模式报错
|
|
||||||
if (data.amount === '' || data.amount === undefined) data.amount = 0;
|
if (data.amount === '' || data.amount === undefined) data.amount = 0;
|
||||||
if (data.incurred_amount === '' || data.incurred_amount === undefined) data.incurred_amount = 0;
|
if (data.incurred_amount === '' || data.incurred_amount === undefined) data.incurred_amount = 0;
|
||||||
|
if (!data.status) data.status = '计入费用';
|
||||||
var isEdit = !!data.expense_id;
|
var isEdit = !!data.expense_id;
|
||||||
delete data.expense_id;
|
delete data.expense_id;
|
||||||
|
|
||||||
|
|||||||
@@ -304,7 +304,9 @@ function renderFinance() {
|
|||||||
const tdRow = (pf, rev, payment, cost, paid, gross) => {
|
const tdRow = (pf, rev, payment, cost, paid, gross) => {
|
||||||
const cashflow = payment - paid;
|
const cashflow = payment - paid;
|
||||||
const exe = rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) + '%' : '<span class="text-slate-300">—</span>';
|
const exe = rev && pf.sign_amount ? Math.round(rev / pf.sign_amount * 100) + '%' : '<span class="text-slate-300">—</span>';
|
||||||
const payR = rev && payment ? Math.round(payment / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
|
const payRVal = rev && payment ? Math.round(payment / rev * 100) : null;
|
||||||
|
const payRCls = payRVal === null ? '' : payRVal < 30 ? 'text-red-600' : payRVal < 80 ? 'text-amber-600' : 'text-green-600';
|
||||||
|
const payR = payRVal !== null ? '<span class="' + payRCls + ' font-semibold">' + payRVal + '%</span>' : '<span class="text-slate-300">—</span>';
|
||||||
const paidR = cost && paid ? Math.round(paid / cost * 100) + '%' : '<span class="text-slate-300">—</span>';
|
const 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 grossR = rev && gross ? Math.round(gross / rev * 100) + '%' : '<span class="text-slate-300">—</span>';
|
||||||
const st = pf.status === '已签约' ? '<span class="text-green-600">已签约</span>' : '<span class="text-amber-600">待签约</span>';
|
const st = pf.status === '已签约' ? '<span class="text-green-600">已签约</span>' : '<span class="text-amber-600">待签约</span>';
|
||||||
|
|||||||
@@ -4,6 +4,15 @@ function renderHome() {
|
|||||||
const { summary, financeMonthly } = state.data;
|
const { summary, financeMonthly } = state.data;
|
||||||
const m = summary.metrics;
|
const m = summary.metrics;
|
||||||
const moneyInt = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
|
const moneyInt = (v) => `${Math.round(Number(v || 0)).toLocaleString("zh-CN")} 元`;
|
||||||
|
// 回款提醒
|
||||||
|
const yrRev = m.revenue_annual || 0, yrPay = m.payment_annual || 0, yrUnpaid = yrRev - yrPay;
|
||||||
|
const yrPayRate = yrRev > 0 ? Math.round(yrPay / yrRev * 100) : 0;
|
||||||
|
const yrUnpaidWan = Math.round(yrUnpaid / 10000);
|
||||||
|
const payRateCls = yrPayRate < 30 ? 'text-red-600' : yrPayRate < 80 ? 'text-amber-600' : 'text-green-600';
|
||||||
|
const payReminder = yrRev > 0 ? '<div class=\"flex items-center gap-3 px-4 py-3 rounded-lg border\" style=\"background:linear-gradient(135deg,#fef3c7,#fde68a);border-color:#f59e0b\">' +
|
||||||
|
'<i data-lucide=\"bell-ring\" class=\"text-amber-600 flex-shrink-0\" style=\"width:18px;height:18px\"></i>' +
|
||||||
|
'<span class=\"text-sm text-amber-900\"><strong>回款提醒:</strong>本年度确收 <strong>' + moneyInt(yrRev) + '</strong>,回款 <strong>' + moneyInt(yrPay) + '</strong>,你还有 <strong class=\"text-red-600\">' + yrUnpaidWan + '万</strong> 未回款,当前回款率:<strong class=\"' + payRateCls + '\">' + yrPayRate + '%</strong></span>' +
|
||||||
|
'</div>' : '';
|
||||||
const rows1 = [
|
const rows1 = [
|
||||||
["年度累计", moneyInt(m.signed_annual || m.signed_amount)],
|
["年度累计", moneyInt(m.signed_annual || m.signed_amount)],
|
||||||
["本季度累计", moneyInt(m.signed_q2 || 0)],
|
["本季度累计", moneyInt(m.signed_q2 || 0)],
|
||||||
@@ -113,6 +122,7 @@ function renderHome() {
|
|||||||
["产品迭代", m.upcoming_products, "products"],
|
["产品迭代", m.upcoming_products, "products"],
|
||||||
].map(([label, value, tab]) => `<button class="metric-card" onclick="switchTab('${tab}')"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="gauge"></i>${label}</span><strong class="mt-2 block text-2xl">${value}</strong></button>`).join("")}
|
].map(([label, value, tab]) => `<button class="metric-card" onclick="switchTab('${tab}')"><span class="flex items-center gap-2 text-xs text-slate-500"><i data-lucide="gauge"></i>${label}</span><strong class="mt-2 block text-2xl">${value}</strong></button>`).join("")}
|
||||||
</div>`}
|
</div>`}
|
||||||
|
${payReminder}
|
||||||
${card(`<h3 class="text-sm font-bold text-slate-700 mb-3">部门经营情况</h3><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr></thead><tbody>
|
${card(`<h3 class="text-sm font-bold text-slate-700 mb-3">部门经营情况</h3><div class="overflow-x-auto"><table class="w-full text-sm"><thead><tr class="border-b border-slate-200"><th class="py-2 text-left text-slate-500">指标</th><th class="py-2 text-right font-semibold text-slate-700">年度累计</th><th class="py-2 text-right font-semibold text-slate-700">上季度累计</th><th class="py-2 text-right font-semibold text-slate-700">上月累计</th><th class="py-2 text-right font-semibold text-slate-700">本季度累计</th><th class="py-2 text-right font-semibold text-slate-400">季环比</th><th class="py-2 text-right font-semibold text-slate-700">本月累计</th><th class="py-2 text-right font-semibold text-slate-400">月环比</th></tr></thead><tbody>
|
||||||
${(() => {
|
${(() => {
|
||||||
var d = [
|
var d = [
|
||||||
|
|||||||
@@ -76,7 +76,7 @@
|
|||||||
<header class="topbar border-b border-slate-200 bg-white px-8 py-5">
|
<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 items-center gap-3 w-full">
|
||||||
<div class="flex-1">
|
<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.4</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.7</span></p>
|
||||||
<div class="flex items-center gap-4 mt-1">
|
<div class="flex items-center gap-4 mt-1">
|
||||||
<h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
|
<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">
|
<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">
|
||||||
|
|||||||
Reference in New Issue
Block a user