diff --git a/src/utils/formatMoney.js b/src/utils/formatMoney.js index 4cb8d52..6dc73fd 100644 --- a/src/utils/formatMoney.js +++ b/src/utils/formatMoney.js @@ -1,4 +1,5 @@ export function formatMoney(money) { + if(money === 0) return '0.00' if(money === '') return '' var num = (money || 0).toString(), re = /\d{3}$/, diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue index 1e6cf6b..6d06463 100644 --- a/src/views/packManagement/PackCompanyList.vue +++ b/src/views/packManagement/PackCompanyList.vue @@ -146,6 +146,13 @@ const defaultTableColumns = [ dataIndex: 'packChargeTotal', scopedSlots: { customRender: 'allMoney' } }, + { + title: '确认收入', + align: 'center', + width: 180, + dataIndex: 'confirmAmount', + scopedSlots: { customRender: 'allMoney' } + }, { title: '实际到账费用', align: 'center', @@ -276,7 +283,9 @@ export default { id: '1', title: '总计', packChargeTotal: res.result.sumOfMoney || '0.00' + '', - receiptExpense: res.result.sumOfConfirmAmount || '0.00' + '' + receiptExpense: res.result.sumOfReallyMoney || '0.00' + '', + confirmAmount: res.result.sumOfConfirmAmount || '0.00' + '', + } this.footerDataSource = [obj] if (pageListObj.total) {