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

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',