安品利润总账合计计算

src/views/reportAnalysis/profitGeneralLedger.vue

@@ -432,15 +432,44 @@ export default {
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '总计'
-        } else if (column.label === '收入' || column.label === '支出' || column.label === '利润') {
+        } else if (column.label === '收入' || column.label === '支出' || column.label === '利润'|| column.label === '利润率(%)') {
           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
+                console.log(index)
+                if (column.label === '利润率(%)'){
+                  if (this.getRowList.length !== 0){
+                    let i = ''
+                    let e = ''
+                    for (let item in this.getRowList){
+                      if (this.getRowList[item].name == '利润'){
+                        i  = (Number(item)+1)
+                      }
+                      if (this.getRowList[item].name == '支出'){
+                        e  = (Number(item)+1)
+                      }
+                    }
+                    return (sums[i]/sums[e]*100).toFixed(2)
+                  }else {
+                    let t = ''
+                    let y = ''
+                    for (let item in this.tableDate){
+                      if (this.tableDate[item].name == '利润'){
+                        t  = (Number(item)+1)
+                      }
+                      if (this.tableDate[item].name == '支出'){
+                        y  = (Number(item)+1)
+                      }
+                    }
+                    return (sums[t]/sums[y]*100).toFixed(2)
+                  }
+                  return (Number(prev) / Number(curr)).toFixed(2)
+                }
+                return (Number(prev) + Number(curr)).toFixed(2)
               } else {
-                return prev
+                return Number(prev).toFixed(2)
               }
             }, 0)
           }
@@ -462,7 +491,6 @@ export default {
         this.loading = false
       })
     },
-
     /** 搜索按钮操作 */
     handleQuery() {
       this.$refs["rules"].validate((valid) => {

vue.config.js

@@ -34,8 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.1.143:9020`,
-        // target: `http://localhost:8080`,
+        // target: `http://192.168.1.177:9020`,
         target: `https://ap.tubaosoft.com/prod-api/`,
         changeOrigin: true,
         pathRewrite: {