Browse Source

bug修改

hy 6 years ago
parent
commit
ad87da1135

+ 2 - 2
frontend/saas-web/app/view/money/report/PayDetail.js

@@ -160,10 +160,10 @@ Ext.define('saas.view.money.report.PayDetail', {
                     let nowGroup = rec.get('groupfield')
                     let nextGroup = grid.store.data.items[index+1].get('groupfield')
                     if(nowGroup!=nextGroup){
-                        sum+=rec.get('pd_remain')
+                        sum+=rec.get('pd_remain')*rec.get('pd_rate')
                     }
                 }else{
-                    sum+=rec.get('pd_remain') 
+                    sum+=rec.get('pd_remain')*rec.get('pd_rate')
                 }
             });
             return saas.util.BaseUtil.numberFormat(sum, 2, true);

+ 2 - 2
frontend/saas-web/app/view/money/report/RecDetail.js

@@ -161,10 +161,10 @@ Ext.define('saas.view.money.report.RecDetail', {
                     let nowGroup = rec.get('groupfield')
                     let nextGroup = grid.store.data.items[index+1].get('groupfield')
                     if(nowGroup!=nextGroup){
-                        sum+=rec.get('rd_remain')
+                        sum+=rec.get('rd_remain')*rec.get('rd_rate')
                     }
                 }else{
-                    sum+=rec.get('rd_remain') 
+                    sum+=rec.get('rd_remain')*rec.get('rd_rate')
                 }
             });
             return saas.util.BaseUtil.numberFormat(sum, 2, true);