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

frontend/saas-web/app/view/core/query/QueryFormPanel.js

@@ -34,14 +34,20 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
 
     listeners: {
         beforerender: function(form) {
-            var fiels = form.getForm().getFields();
-            fiels.each(function(f) {
-                f.on && f.on({
-                    keydown: {
-                        fn: 'onQuery',
-                    }
-                });
-            });
+            // var fiels = form.getForm().getFields();
+            // fiels.each(function(f) {
+            //     console.log(f, f.on);
+            //     f.on && f.on({
+            //         keydown: {
+            //             // fn: 'onQuery',
+            //             fn: function(th, e, eOpts) {
+            //                 if(e.keyCode == 13) {
+            //                     form.up('core-query-querypanel').getController().onQuery()
+            //                 }
+            //             }
+            //         }
+            //     });
+            // });
         }
     }
 

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     },{
         xtype: 'vendorDbfindTrigger',
         name: 'pb_vendname',
-        fieldLabel: '供应商',
+        fieldLabel: '供应商名称',
     },{
         xtype: 'textfield',
         name: 'pb_manname',

frontend/saas-web/app/view/money/payBalance/QueryPanelController.js

@@ -21,7 +21,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
+                            from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -27,7 +27,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rd_bankid'
+                            from: 'id', to: 'rd_bankid',ignore:true
                         }, {
                             from:'bk_bankcode', to:'rd_bankcode'
                         },{
@@ -44,7 +44,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         addTitle: '源单单据',
                         dbfinds: [{
                             from: 'id',
-                            to: 'rbd_slid'
+                            to: 'rbd_slid',ignore:true
                         }, {
                             from: 'sl_code',
                             to: 'rbd_slcode'

frontend/saas-web/app/view/money/recBalance/QueryPanelController.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                     Ext.apply(f,{
                         //赋值
                         dbfinds:[{
-                            from: 'id', to: 'rb_custid'
+                            from: 'id', to: 'rb_custid',ignore:true
                         }, {
                             from:'cu_code', to:'rb_custcode'
                         },{

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

@@ -171,7 +171,7 @@
             "id": "monry-report-customercheck",
             "viewType":"monry-report-customercheck"
         }, {
-            "text": "应收款明细表",
+            "text": "应收账款明细表",
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
         }, {