diff --git a/static/modules/finance.js b/static/modules/finance.js
index 351ed5b..a1e7968 100644
--- a/static/modules/finance.js
+++ b/static/modules/finance.js
@@ -113,11 +113,14 @@ function renderFinance() {
const toolQuarterSelect = qLabels2.map((l,i) => '').join("");
const toolDateSelect = state.finView==='monthly'?'月份：':state.finView==='quarterly'?'季度：':'';
- const finHeaderBase = `视图：状态：${toolDateSelect}`;
+ const finHeaderBase = `视图：${toolDateSelect}`;
const finAddBtn = ``;
+ const finFilterTabs = ``;
+
document.querySelector("#finance").innerHTML = `
- ${card(`
${finHeaderBase}
${finAddBtn}
`, "p-3")}
+ ${finFilterTabs}
+ ${card(`
${finHeaderBase}
${finAddBtn}
`, "p-4")}
@@ -234,20 +237,21 @@ function renderFinance() {
' +
- '| 项目名称 | ' +
- '状态 | ' +
- '签约金额 | ' +
- '已确收 | ' +
- '毛利 | ' +
- '成本 | ' +
- '项目利润 | ' +
- '已回款 | ' +
- '已付 | ' +
- '现金流 | ' +
- '执行率 | ' +
- '毛利率 | ' +
- '回款率 | ' +
- '付款率 | ' +
- '
';
- const tbody = rows.length ? `${rows.join("")}` : `| ${emptyText} |
`;
+ const thead = isUnsigned
+ ? '' +
+ '| 项目名称 | ' +
+ '状态 | ' +
+ '签约金额 | ' +
+ '签约月份 | ' +
+ '毛利 | ' +
+ '成本 | ' +
+ '项目利润 | ' +
+ '
'
+ : '' +
+ '| 项目名称 | ' +
+ '状态 | ' +
+ '签约金额 | ' +
+ '已确收 | ' +
+ '毛利 | ' +
+ '成本 | ' +
+ '项目利润 | ' +
+ '已回款 | ' +
+ '已付 | ' +
+ '现金流 | ' +
+ '执行率 | ' +
+ '毛利率 | ' +
+ '回款率 | ' +
+ '付款率 | ' +
+ '
';
+ const theadCols = isUnsigned ? 7 : 14;
+ const tbody = rows.length ? `${rows.join("")}` : `| ${emptyText} |
`;
- return card(`${cards.map(([l, v, c]) => '
' + l + '' + v + '
').join("")}
项目财务明细
合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流 → 执行率 → 毛利率 → 回款率 → 付款率
`, "p-4");
+ const cardGrid = isUnsigned ? 'grid-cols-4' : 'grid-cols-6';
+ const subtitle = isUnsigned
+ ? '合同 → 毛利 → 成本 → 项目利润'
+ : '合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流 → 执行率 → 毛利率 → 回款率 → 付款率';
+ return card(`${cards.map(([l, v, c]) => '
' + l + '' + v + '
').join("")}
项目财务明细
${subtitle}
`, "p-4");
};
const fmtNoUnit = (v) => v ? `${Number(v||0).toLocaleString('zh-CN')}` : '—';
@@ -292,6 +311,14 @@ function renderFinance() {
const pfVal = profit ? money(profit) : '—';
return `| ${esc(pf.customer_name)} | ${st} | ${money(pf.sign_amount)} | ${fmtNoUnit(rev)} | ${fmtNoUnit(gross)} | ${fmtNoUnit(cost)} | ${pfVal} | ${fmtNoUnit(payment)} | ${fmtNoUnit(paid)} | ${cf} | ${exe} | ${grossR} | ${payR} | ${paidR} |
`;
};
+ // 待签约简版行
+ const tdRowUnsigned = (pf, cost, gross) => {
+ const st = pf.status === '待签约' ? '待签约' : '已签约';
+ const profit = gross;
+ const pfCls = profit >= 0 ? 'text-green-600' : 'text-red-600';
+ const pfVal = profit ? money(profit) : '—';
+ return `| ${esc(pf.customer_name)} | ${st} | ${money(pf.sign_amount)} | ${pf.sign_month || '—'} | ${fmtNoUnit(gross)} | ${fmtNoUnit(cost)} | ${pfVal} |
`;
+ };
if (state.finView === 'monthly') {
const allPfs = pfs.filter(x => x.status === state.finFilter);
@@ -313,7 +340,7 @@ function renderFinance() {
const paid = Math.round(parseFloat(e.paid || 0) || 0);
if (!rev && !payment && !cost && !paid && !gross) return;
sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
- rows.push(tdRow(pf, rev, payment, cost, paid, gross));
+ rows.push(isUnsigned ? tdRowUnsigned(pf, cost, gross) : tdRow(pf, rev, payment, cost, paid, 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;
@@ -349,7 +376,7 @@ function renderFinance() {
const cost = sumExpense(pf, "cost");
const paid = sumExpense(pf, "paid");
sumRev += rev; sumPay += payment; sumCost += cost; sumPaid += paid; sumGross += gross;
- rows.push(tdRow(pf, rev, payment, cost, paid, gross));
+ rows.push(isUnsigned ? tdRowUnsigned(pf, cost, gross) : tdRow(pf, rev, payment, cost, paid, 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;
@@ -372,7 +399,7 @@ function renderFinance() {
allPfs.forEach(pf => {
const t = calcTotals(pf);
sumRev += t.rev; sumPay += t.payment; sumCost += t.cost; sumPaid += t.paid; sumGross += t.gross;
- rows.push(tdRow(pf, t.rev, t.payment, t.cost, t.paid, t.gross));
+ rows.push(isUnsigned ? tdRowUnsigned(pf, t.cost, t.gross) : tdRow(pf, t.rev, t.payment, t.cost, t.paid, t.gross));
});
const signTotal = Math.round(allPfs.reduce((a, p) => a + (p.sign_amount || 0), 0));
const signCnt = allPfs.filter(x => x.status === "已签约").length;
diff --git a/static/modules/utils.js b/static/modules/utils.js
index 42c9d11..89510f6 100644
--- a/static/modules/utils.js
+++ b/static/modules/utils.js
@@ -192,6 +192,10 @@ window.setFinView = (view) => {
localStorage.setItem("opc-fin-view", view);
renderFinance();
};
+window.switchFinFilter = (filter) => {
+ state.finFilter = filter;
+ renderFinance();
+};
window.switchTenant = (tenant) => {
state.tenant = tenant;
state.selectedProject = null;