Merge remote-tracking branch 'origin/dev' into dev

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

@@ -138,7 +138,7 @@ Ext.define('saas.view.core.base.GridPanel', {
     },
 
     onLoad:function(){
-        this.store.load();
+        this.ownerCt.ownerCt.store.load();
     },
 
     onVastDeal:function(url,type){

frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -5,7 +5,22 @@ Ext.define('saas.view.document.bom.BasePanel', {
     controller: 'document-bom-basepanel',
     viewModel: 'document-bom-basepanel',
 
-    searchField:[],
+    searchField:[{ 
+        xtype : "textfield", 
+        name : "bo_mothercode", 
+        emptyText : "母件编号", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "bo_mothername", 
+        emptyText : "母件名称", 
+        width:120
+    },{
+        xtype : "textfield", 
+        name : "bo_status", 
+        emptyText : "BOM状态",    
+        width:100
+    }],
 
     //字段属性
     _formXtype:'document-bom-formpanel',

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -175,7 +175,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_whcode", 
         bind : "{pr_whcode}", 
         fieldLabel : "仓库编号", 
-        allowBlank : false, 
+        allowBlank : true, 
         columnWidth : 0.25, 
     }, {
         xtype : "textfield", 

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

@@ -81,12 +81,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
+                            from:'pr_code',to:'pd_prodcode'
+                        },{
                             from:'pr_unit',to:'pd_unit'
                         }],
                         dbtpls:[{

frontend/saas-web/app/view/sale/report/Sale.js

@@ -7,7 +7,7 @@ Ext.define('saas.view.sale.report.Sale', {
 
     viewName: 'sale-report-sale',
 
-    groupField: null,
+    groupField: 'sa_custcode',
     listUrl: '/api/sale/sale/list',
     defaultCondition: null,
     reportTitle: '销售明细报表',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -95,16 +95,16 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             width: 200
         },{
             text: '销售单号',
-            dataIndex: 'pi_pucode',
+            dataIndex: 'pd_ordercode',
             width: 200
         }, {
-            xtype: 'hidden',
-            name: 'pi_custcode',
-            fieldLabel: '客户编号'
+            text: '客户编号',
+            dataIndex: 'pi_custcode',
+            width: 200
         }, {
-            xtype: 'dbfindtrigger',
-            name: 'pi_custname',
-            fieldLabel: '客户名称'
+            text: '客户名称',
+            dataIndex: 'pi_custname',
+            width: 200
         },{
             text: '含税金额',
             dataIndex: 'pi_total',

frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype : "", 
     },{
         text : "物料名称", 
-        width : 200.0, 
+        width : 150.0, 
         dataIndex : "rc_prodDetail", 
     }, 
     {
@@ -75,12 +75,12 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     {
         text : "单位", 
         dataIndex : "rc_prodUnit", 
-        width : 120.0, 
+        width : 80.0, 
     }, 
     {
         text : "仓库编号", 
         dataIndex : "rc_whCode", 
-        width : 0, 
+        width : 100, 
     }, 
     {
         text : "仓库名称",