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

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -162,7 +162,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
 
     judge:function(f){
-        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1){
+        if(f.ownerCt.xtype.trim().toUpperCase().indexOf('QUERYFORMPANEL')>-1||(f.ownerCt.ownerCt&&f.ownerCt.ownerCt.xtype.trim().toUpperCase().indexOf('BASEPANEL')>-1)){
             f.belong = 'form';
             return f.ownerCt.ownerCt
         }else if(f.ownerCt.xtype.trim().toUpperCase().indexOf('FORM')>-1){

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -7,15 +7,15 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     viewName: 'money-report-accountbalance',
 
-    groupField: null,
+    groupField: 'bankname',
     listUrl: '/api/money/report/accountBalance',
     defaultCondition: null,
-    reportTitle: '资金账户收支明细',
+    reportTitle: '资金账户余额表',
     QueryWidth:0.25,
     //筛选：账户、日期（必填）
     searchItems: [ {
         xtype: 'bandinfoDbfindTrigger',
-        name: 'bankcode',
+        name: 'bankname',
         fieldLabel: '账户名称',
         columnWidth: 0.25
     }, {
@@ -44,11 +44,37 @@ Ext.define('saas.view.money.report.AccountBalance', {
         },{
             text:'收入',
             dataIndex:'outamount',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : 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);
+            },
+            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:'支出',
             dataIndex:'thisamount',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : 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);
+            },
+            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: '账户余额',
             dataIndex: 'pr_code',

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     caller:'Purchase',
     
      //字段属性
-     _title:'采购单',
+     _title:'采购订单',
      _idField: 'id',
      _codeField: 'pu_code',
      _statusField: 'pu_status',

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -85,7 +85,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     queryGridConfig: {
         idField: 'pu_id',
         codeField: 'pu_code',
-        addTitle: '采购单',
+        addTitle: '采购订单',
         addXtype: 'purchase-purchase-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/purchase/purchase/',

frontend/saas-web/resources/json/navigation.json

@@ -5,7 +5,7 @@
         "text": "制单",
         "items": [{
             "id": "purchase",
-            "text": "采购单",
+            "text": "采购订单",
             "addType": "purchase-purchase-formpanel",
             "viewType": "purchase-purchase-querypanel"
         }, {