Browse Source

Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

# Conflicts:
#	src/layout/index/top/index.vue
achao 3 years ago
parent
commit
237865b6d2
1 changed files with 6 additions and 4 deletions
  1. 6 4
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue

+ 6 - 4
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -1004,8 +1004,10 @@ export default {
           index === 13 ||
           index === 9
         ) {
-          const values = data.map((item) => Number(item[column.property]))
-          if (!values.every((value) => isNaN(value))) {
+          const values = data.map((item) => Number(item[column.property])) 
+          console.log(values)
+          // console.log(values)
+          if (values.length>0) {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
@@ -1015,7 +1017,7 @@ export default {
               }
             }, 0)
           } else {
-            sums[index] = '元'
+            sums[index] = 0
           }
         } else {
           sums[index] = '--'
@@ -1028,7 +1030,7 @@ export default {
         sums[sums.length-4]=sums[sums.length-4].toFixed(2)
       }
       if(typeof sums[sums.length-5]=='number'){
-        sums[sums.length-5]=sums[sums.length-3].toFixed(2)
+        sums[sums.length-5]=sums[sums.length-5].toFixed(2)
       }
       if(typeof sums[sums.length-7]=='number'){
         sums[sums.length-7]=sums[sums.length-7].toFixed(2)