Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -300,8 +300,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{

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

@@ -346,8 +346,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{

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -111,7 +111,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                         text: '禁用',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
-                            me.onVastDeal(form._batchCloseUrl,'CLOSE');
+                            me.onVastDeal(form._batchCloseUrl,'BANNED');
                         },
                         menu: {
                             cls:'x-query-menu',
@@ -253,10 +253,8 @@ Ext.define('saas.view.core.base.GridPanel', {
         boxready: function(grid, width, height, eOpts) {
             var store = grid.getStore(),
             gridBodyBox = grid.body.dom.getBoundingClientRect(),
-            gridBodyBoxHeight = gridBodyBox.height;
-
-            var pageSize = Math.floor(gridBodyBoxHeight / 32);
-
+            gridBodyBoxHeight = gridBodyBox.height;//可能有滚动条
+            var pageSize = Math.floor(gridBodyBoxHeight / 33);
             store.setPageSize(pageSize);
         },
         itemClick: function(view,record,a,index,c) {

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: '应收余额',