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

frontend/saas-web/app/model/sale/ProdIODetail.js

@@ -13,7 +13,7 @@ Ext.define('saas.model.sale.ProdIODetail', {
         { name: 'pd_prodid', type: 'int' },
         { name: 'pd_prodcode', type: 'string' },
         { name: 'pd_unit', type: 'string' },
-        { name: 'pd_inqty', type: 'int' },
+        { name: 'pd_inqty', type: 'float' },
         { name: 'pd_outqty', type: 'float' },
         { name: 'pd_orderprice', type: 'float' },
         { name: 'pd_sendprice', type: 'float' },

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

@@ -162,6 +162,10 @@ Ext.define('saas.view.core.base.GridPanel', {
         this.ownerCt.ownerCt.store.load();
     },
 
+    onImport:function(){
+        var grid = this.ownerCt.ownerCt;
+    },
+
     onExport:function(me){
         var grid = me.ownerCt.ownerCt;
         //导出接口权限设置
@@ -212,6 +216,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                 .then(function() {
                     saas.util.BaseUtil.showSuccessToast('操作成功');
                     grid.store.load();
+                    grid.selModel.deselectAll();
                 })
                 .catch(function(res) {
                     console.error(res);

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

@@ -188,28 +188,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     bind: {
                         hidden: '{!auditEnable}'
                     }
-                }, {
-                    text: '打印',
-                    handler: me.onPrint,
-                    menu: {
-                        cls:'x-query-menu',
-                        width: 80,
-                        items: [{
-                            text:'设置',
-                            handler:function(){
-                                me.onPrintSet(this)
-                            }
-                        }],
-                        listeners: {
-                            'mouseleave':function(enu){
-                                this.hide();
-                            } 
-                        }
-                    },
-                    bind: {
-                        hidden: '{!printEnable}'
-                    }
-                }, {
+                },  {
                     text: '导入',
                     handler: me.onImport,
                     menu: {
@@ -398,7 +377,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 }else{
                     saas.util.BaseUtil.showSuccessToast('操作成功');
                 }
-                me.getStore().loadPage(1);
+                me.store.load();
+                me.selModel.deselectAll();
             })
             .catch(function(res) {
                 console.error(res);

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -21,6 +21,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
     defaultCondition: null, // 默认查询条件
     searchItems: [], // 查询字段
     reportTitle: '报表',
+    autoLoad:true,
 
     initComponent: function() {
         var me = this;
@@ -43,7 +44,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     items: [{
                         xtype: 'button',
                         text: '查询',
-                        handler: 'onQuery'
+                        handler: 'onQuery',
+                        formBind:true
                     },{
                         xtype:'button',
                         text:'打印',
@@ -180,7 +182,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
         var store = Ext.create('Ext.data.Store', {
             fields: me.getFields(),
             // model: me.reportModel,
-            autoLoad: true,
+            autoLoad: me.autoLoad,
             pageSize: 15,
             data: [],
             proxy: {
@@ -335,6 +337,11 @@ Ext.define('saas.view.core.report.ReportPanel', {
             ignore = item.ignore,
             defaultValue = item.defaultValue;
 
+            if(item.allowBlank==false){
+                // TODO 需要判断类型
+                item.beforeLabelTextTpl = "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>";
+            }
+
             if(item.xtype == 'numberfield') {
                 Ext.applyIf(item, {
                     hideTrigger: true, // 隐藏trigger