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

frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
 
     //数据接口
     dataUrl:'/api/document/employee/list',
-    addXtype: 'document-vendor-formpanel',
+    addXtype: 'other-employee',
     addTitle: '人员资料',
     //联想设置
     dbtpls:[{

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             if(value == 'ALL') {
                 return '1=1';
             }else {
-                return  ' (rd_code like\'%' + value + '%\' '
+                return  ' (rb_code like\'%' + value + '%\' '
                 +' or rb_custcode like \'%'+value+'%\' '
                 +' or rb_custname like \'%'+value+'%\') ';
             }

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanelController.js

@@ -10,8 +10,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'pr_detail',to:'pr_detail',
-                        },{
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'

frontend/saas-web/app/view/stock/otherIn/QueryPanelController.js

@@ -5,6 +5,19 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            // 物料编号
+            'dbfindtrigger[name=pr_detail]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
+                        }],
+                    }) ;   
+
+                }
+            }
         });
     }
 });

frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -5,6 +5,19 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            // 物料编号
+            'dbfindtrigger[name=pr_detail]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'pr_code',to:'pd_prodcode'
+                        }, {
+                            from:'pr_detail',to:'pr_detail'
+                        }],
+                    }) ;   
+
+                }
+            }
         });
     }
 });