diff --git a/static/modules/finance.js b/static/modules/finance.js
index 4b8a3d0..2bf3fd7 100644
--- a/static/modules/finance.js
+++ b/static/modules/finance.js
@@ -305,13 +305,15 @@ function renderFinance() {
['签约金额', m(signTotal), '∑签约金额'],
['确收金额', m(sumRev), '∑确收金额'],
['毛利', m(sumGross), '∑毛利'],
+ ['回款', m(sumPay), '∑回款金额'],
+ ['支出', m(sumPaid), '∑支出金额'],
+ ['现金流', m(cashflow), '回款 − 支出'],
['应收', m(receivable), '确收 − 回款'],
['应付', m(payable), '成本 − 支出'],
- ['现金流', m(cashflow), '回款 − 支出'],
['往来余额', m(netAsset), '应收 − 应付'],
];
- const fs = '
' + rows_data.map(r =>
- '
').join('') + '
';
+ const fs = '' + rows_data.map((r, i) =>
+ '
' + r[0] + ' ' + r[1] + '
').join('') + '
';
const thead = isUnsigned ? buildThead(UNSIGNED_COLS, 'uns') : buildThead(SIGNED_COLS, 'sig');
const theadCols = isUnsigned ? 6 : 15;
const tbody = rows.length ? `${rows.join("")}` : `| ${emptyText} |
`;
diff --git a/static/modules/plan.js b/static/modules/plan.js
index 06a94b1..b0da0a6 100644
--- a/static/modules/plan.js
+++ b/static/modules/plan.js
@@ -323,13 +323,15 @@ function renderPlan() {
['签约金额', m(signTotal), '∑签约金额'],
['确收金额', m(sumRev), '∑确收金额'],
['毛利', m(sumGross), '∑毛利'],
+ ['回款', m(sumPay), '∑回款金额'],
+ ['支出', m(sumPaid), '∑支出金额'],
+ ['现金流', m(cashflow), '回款 − 支出'],
['应收', m(receivable), '确收 − 回款'],
['应付', m(payable), '成本 − 支出'],
- ['现金流', m(cashflow), '回款 − 支出'],
['往来余额', m(netAsset), '应收 − 应付'],
];
- const fs = '' + rows_data.map(r =>
- '
').join('') + '
';
+ const fs = '' + rows_data.map((r, i) =>
+ '
' + r[0] + ' ' + r[1] + '
').join('') + '
';
const thead = isUnsigned ? buildThead(UNSIGNED_COLS, 'uns') : buildThead(SIGNED_COLS, 'sig');
const theadCols = isUnsigned ? 9 : 15;
const tbody = rows.length ? `${rows.join("")}` : `| ${emptyText} |
`;
diff --git a/templates/index.html b/templates/index.html
index b035713..675f31b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -84,7 +84,7 @@
-
OPC Manager v1.2.0.35
+
OPC Manager v1.2.0.36