From c5fd68b17c7ced42e79def6053d507d104cec86e Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Thu, 2 Apr 2020 13:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FundApproval2/index.vue | 33 +++++++++++++++++--
.../FundApproval3/index.vue | 33 +++++++++++++++++--
.../RequestOutsourcingMaterials/index.vue | 5 ---
3 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue
index 7cd4fdd2..3ea32627 100644
--- a/src/views/WorkshopProcurement/FundApproval2/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval2/index.vue
@@ -15,7 +15,7 @@
- {{ scope.row.请款金额 }}
+ {{ Number(scope.row.请款金额).toFixed(2) }}
@@ -31,7 +31,7 @@
-
+
@@ -40,7 +40,7 @@
- {{ scope.row.请款金额 }}
+ {{ Number(scope.row.请款金额).toFixed(2) }}
@@ -242,6 +242,33 @@ export default {
this.fetchData()
},
methods: {
+ // 合计
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ return
+ } else if (index === 2) {
+ 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
+ },
fetchData() {
this.searchTable()
},
diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index 29043193..483c45ae 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -15,7 +15,7 @@
- {{ scope.row.请款金额 }}
+ {{ Number(scope.row.请款金额).toFixed(2) }}
@@ -31,7 +31,7 @@
-
+
@@ -40,7 +40,7 @@
- {{ scope.row.请款金额 }}
+ {{ Number(scope.row.请款金额).toFixed(2) }}
@@ -252,6 +252,33 @@ export default {
this.searchTable()
},
methods: {
+ // 合计
+ getSummaries(param) {
+ const { columns, data } = param
+ const sums = []
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '合计'
+ return
+ } else if (index === 2) {
+ 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
+ },
fetchData() {
this.searchTable()
this.searchTable2()
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 22627d26..3865c6db 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -172,11 +172,6 @@
{{ scope.row.发票号 }}
-
-
- {{ scope.row.供应商名称 }}
-
-
{{ Number(scope.row.开票金额).toFixed(2) }}