Browse Source

1.付款状态
2.总账合计

heqinwei 7 years ago
parent
commit
ac83f13a29

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -299,8 +299,10 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
                         switch (status) {
                             case  "已付款" :
                                 statuscode = Status.PAYALL.name();
+                                break;
                             case "部分付款":
                                 statuscode = Status.PAYPART.name();
+                                break;
                             default: statuscode = Status.PAYNONE.name();
                         }
                     }else{

+ 2 - 0
applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -345,8 +345,10 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
                         switch (status) {
                             case  "已收款" :
                                 statuscode = Status.RECALL.name();
+                                break;
                             case "部分收款":
                                 statuscode = Status.RECPART.name();
+                                break;
                             default: statuscode = Status.RECNONE.name();
                         }
                     }else{

+ 7 - 0
frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -100,6 +100,13 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
+        },
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v, format);
         }
     }, {
         text: '应收余额',