@@ -339,6 +340,7 @@ function renderPlan() {
? '合同 → 毛利 → 成本 → 项目利润'
: '合同 → 确收 → 毛利 → 成本 → 项目利润 → 回款 → 已付 → 现金流';
return `
${cards.map(([l, v, c]) => '
' + l + ' ' + v + '
').join("")}
` +
+ `${isUnsigned ? '' : `
${card(`
${finHeaderBase}
${finAddBtn}
`, "py-2 px-4")}
`}` +
card(`
项目财务明细
${subtitle}
`, "p-4");
};
diff --git a/static/modules/plan_expense.js b/static/modules/plan_expense.js
index adc23ff..ea0bc08 100644
--- a/static/modules/plan_expense.js
+++ b/static/modules/plan_expense.js
@@ -4,7 +4,7 @@ function renderPlanExpense() {
var records = state.data.planExpense || [];
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, '"'); };
- var EXPENSE_TYPES = ['通用费用','平台采购','人力成本','研发费用','奖金','其他'];
+ var EXPENSE_TYPES = ['人力成本','研发费用','奖金','平台采购','通用费用','其他'];
var STATUS_OPTIONS = ['计入费用','暂不计入'];
// 排序状态
@@ -78,12 +78,16 @@ function renderPlanExpense() {
dateSelect = '
季度:';
}
- // Toolbar
- var toolbar = '
视图:类型: