diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
index 85ff798..27244a3 100644
--- a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
+++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue
@@ -145,7 +145,7 @@
v-has="'incomePaymentAndInvoiving:invoicing'">开票
确认来款
diff --git a/src/views/statisticalReport/WholeInstituteStatisticsList.vue b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
index eb42e0e..3ae0e86 100644
--- a/src/views/statisticalReport/WholeInstituteStatisticsList.vue
+++ b/src/views/statisticalReport/WholeInstituteStatisticsList.vue
@@ -307,7 +307,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -382,7 +382,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -504,7 +504,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
index 962a8ca..56cd382 100644
--- a/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
+++ b/src/views/statisticalReport/departmentAllStatistics/DepartmentAllStatistics.vue
@@ -156,7 +156,7 @@ const defaultTableColumns = [
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: {customRender: 'allMoney'}
}
]
@@ -236,7 +236,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
index 25ab854..d56869e 100644
--- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsDetail.vue
@@ -97,6 +97,14 @@
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
+
+
+
+
+ {{ formatMoney(text) }}
+ {{ formatMoney(text) }}
+
+
@@ -135,6 +150,7 @@ import JYearDate from '../../../components/jero/JYearDate'
import { getAction } from '@api/manage'
import ProjectDetailModal from '../../../components/ProjectDetailModal'
import StatusSlot from '../../../components/tools/StatusSlot'
+import {formatMoney} from '@/utils/formatMoney'
export default {
name: 'IndividualPaymentStatisticsDetail',
@@ -198,14 +214,14 @@ export default {
width: 160,
sorter: true,
dataIndex: 'allMoney',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'allMoney' }
},
{
title: '已开票金额',
@@ -220,7 +236,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -262,14 +278,14 @@ export default {
width: 160,
sorter: true,
dataIndex: 'allMoney',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'allMoney' }
}, {
title: '实收金额',
align: 'center',
width: 160,
sorter: true,
dataIndex: 'comeAllMoney',
- scopedSlots: { customRender: 'text' }
+ scopedSlots: { customRender: 'allMoney' }
},
{
title: '已开票金额',
@@ -284,7 +300,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
@@ -302,6 +318,7 @@ export default {
this.setScroll()
},
methods: {
+ formatMoney,
// 同步表与footer滚动,保留底部滚动条
setScroll() {
if (this.dataSource.length === 0) {
@@ -338,7 +355,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
index bdce9f7..193f8bb 100644
--- a/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/IndividualPaymentStatisticsList.vue
@@ -215,7 +215,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
],
@@ -265,7 +265,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
}
],
@@ -353,7 +353,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
index 1f667f1..36bef78 100644
--- a/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue
@@ -255,7 +255,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -325,7 +325,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
@@ -412,7 +412,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
index 6a54a09..d829db5 100644
--- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsDetail.vue
@@ -229,7 +229,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -293,7 +293,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '来款用途',
@@ -360,7 +360,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
index 0305f75..59f6f45 100644
--- a/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
+++ b/src/views/statisticalReport/enterprisePaymentStatistics/EnterprisePaymentStatisticsList.vue
@@ -217,7 +217,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -275,7 +275,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},{
title: '操作',
@@ -369,7 +369,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
if (res.result.pageList.total) {
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
index 4edd103..4fefd8f 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsDetail.vue
@@ -246,7 +246,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -318,7 +318,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},, {
title: '来款用途',
@@ -362,7 +362,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
console.log(this.footerDataSource)
diff --git a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
index 2649833..7e5341f 100644
--- a/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
+++ b/src/views/statisticalReport/workingGroupPaymentStatistics/WorkingGroupPaymentStatisticsList.vue
@@ -224,7 +224,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
},
{
@@ -283,7 +283,7 @@ export default {
align: 'center',
width: 150,
sorter: true,
- dataIndex: 'preComeMoney',
+ dataIndex: 'confirmAmount',
scopedSlots: { customRender: 'allMoney' }
}, {
title: '操作',
@@ -324,7 +324,9 @@ export default {
id: '1',
title: '总计',
allMoney: res.result.sumOfMoney || '0.00' + '',
- comeAllMoney: res.result.sumOfReallyMoney || '0.00' + ''
+ comeAllMoney: res.result.sumOfReallyMoney || '0.00' + '',
+ billMoney: res.result.sumOfBillMoney || '0.00' + '',
+ confirmAmount: res.result.sumOfConfirmAmount || '0.00' + ''
}
this.footerDataSource = [obj]
this.ipagination.total = res.result.pageList.total || 0