diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index e766fa6b..7224ca88 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -158,55 +158,6 @@
-
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index cf83fd6a..b205da00 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -75,7 +75,7 @@
-
+
@@ -84,12 +84,12 @@
- {{ scope.row.已付金额 }}
+ {{ parseFloat(scope.row.已付金额).toFixed(2) }}
- {{ scope.row.请款金额 }}
+ {{ parseFloat(scope.row.请款金额).toFixed(2) }}
@@ -200,17 +200,17 @@
- {{ scope.row.合同总额 ? parseInt(scope.row.合同总额 * 100)/100 : '-' }}
+ {{ scope.row.合同总额 ? (parseInt(scope.row.合同总额 * 100)/100).toFixed(2) : '-' }}
- {{ scope.row.已付金额 }}
+ {{ parseFloat(scope.row.已付金额).toFixed(2) }}
- {{ scope.row.申请中金额 }}
+ {{ parseFloat(scope.row.申请中金额).toFixed(2) }}
@@ -219,7 +219,7 @@
- 合计:元
+ 合计:元
确定请款
@@ -367,6 +367,32 @@ export default {
})
return sums
},
+ getSummaries2(param) { // 合计
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '总价'
+ return
+ } else if (index === 2 || index === 3) {
+ const values = data.map(item => Number(item[column.property]))
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr)
+ if (!isNaN(value)) {
+ return prev + curr
+ } else {
+ return prev
+ }
+ }, 0)
+ sums[index] = sums[index].toFixed(2) + ' 元'
+ } else {
+ sums[index] = 'N/A'
+ }
+ }
+ })
+ return sums
+ },
handleSizeChange1(val) {
this.pageSize1 = val
this.pageCurrent1 = 1
@@ -431,6 +457,7 @@ export default {
this.offGroup.push(val[i].采购合同流水号)
this.sumGroup.push(val[i].请款金额)
}
+ this.SUM = parseFloat(this.SUM).toFixed(2)
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {