diff --git a/static/modules/expense.js b/static/modules/expense.js index 3dd095b..515dd03 100644 --- a/static/modules/expense.js +++ b/static/modules/expense.js @@ -4,7 +4,7 @@ function renderExpense() { var records = state.data.expense || []; 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 renderExpense() { dateSelect = '季度:'; } - // Toolbar - var toolbar = '视图:类型:' + dateSelect; + typeTabs += ''; + + // Toolbar(视图+日期选择器) + var toolbar = '视图:' + dateSelect; // 排序箭头 var sortArrow = function(key) { @@ -119,12 +123,12 @@ function renderExpense() { var target = document.querySelector("#financeExpense") || document.querySelector("#financeTabExpense") || document.querySelector("#expense"); if (!target) return; target.innerHTML = '
' + - '
' + toolbar + '
' + - '
' + - '
费用记录' + filtered.length + '
' + - '
总费用' + money(totalAmount) + '
' + - '
已发生金额' + money(totalIncurred) + '
' + + '
' + + '
费用记录 ' + filtered.length + '
' + + '
总费用 ' + money(totalAmount) + '
' + + '
已发生金额 ' + money(totalIncurred) + '
' + '
' + + '
' + toolbar + '
' + typeTabs + '
' + modal + '
' + tableRows + '
月份' + sortArrow('expense_month') + '费用类型' + sortArrow('expense_type') + '状态' + sortArrow('status') + '金额' + sortArrow('amount') + '已发生金额' + sortArrow('incurred_amount') + '费用说明
' + '
'; diff --git a/static/modules/finance.js b/static/modules/finance.js index b80aafd..cb14b86 100644 --- a/static/modules/finance.js +++ b/static/modules/finance.js @@ -123,7 +123,7 @@ function renderFinance() { 已发生模块:只记录,已经发生的确收,毛利,回款,成本,支出
`} ${finFilterTabs} - ${state.finFilter !== 'expense' && state.finFilter !== 'overview' && state.finFilter !== 'quarterlyOverview' ? card(`
${finHeaderBase}
${finAddBtn}
`, "py-2 px-4") : ''} + ${state.finFilter !== 'expense' && state.finFilter !== 'overview' && state.finFilter !== 'quarterlyOverview' ? '' : ''}