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

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

@@ -0,0 +1,55 @@
+/**
+ * Created by zhouy on 2018/10/25.
+ */
+Ext.define('saas.view.core.query.MoreQueryWin', {
+    extend: 'Ext.window.Window',
+    xtype: 'core-query-morequeryform',
+    modal: true,
+    height: '50%',
+    width: '50%',
+    title: '更多查询',
+    scrollable: true,
+    bodyPadding: 10,
+    constrain: true,
+    closable: true,
+    layout: 'fit',
+    initComponent:function(){
+        var me=this;
+        Ext.apply(me,{
+            items:me.setFormItems()
+        });
+        me.callParent();
+    },
+    setFormItems:function() {
+        var me = this;
+        var form = {
+            xtype: 'form',
+            layout: 'column',
+            autoScroll: true,
+            buttonAlign : 'center',
+            bodyPadding: 5,
+            //frame:true,
+            defaults: {
+                xtype:'textfield',
+                margin: '0 5 5 0',
+                labelAlign: 'right',
+                labelWidth: 90,
+                columnWidth: 0.5,
+                blankText: '该字段不能为空'
+            },
+            items:me.queryItems,
+            buttons: [{
+               text:'重置',
+               handler:'onReSetClick'
+            },'->',{
+                text: '查询',
+                handler:'onMoreQuery'
+            }, {
+                text: '关闭',
+                handler:'onCloseClick'
+            }]
+        };
+        return form ;
+    },
+
+});

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

@@ -242,5 +242,4 @@ Ext.define('saas.view.core.query.QueryPanel', {
 
         return detailModel ? 'DETAIL' : 'MAIN';
     }
-
 });

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

@@ -1,36 +1,24 @@
 Ext.define('saas.view.core.query.QueryPanelController', {
     extend: 'Ext.app.ViewController',
     alias: 'controller.core-query-querypanel',
-
     moreQuery: function (btn) {
-        var me = this;
-        var panel = me.getView();
-        var win = Ext.getCmp('queryMoreWin');
-        if (!win) {
-            win = Ext.create('Ext.window.Window', {
-                modal: true,
-                height: '50%',
-                width: '50%',
-                title: '更多查询',
-                scrollable: true,
-                bodyPadding: 10,
-                constrain: true,
-                closable: true,
-                layout: 'fit',
-                renderTo: Ext.getCmp('main-tab-panel').getActiveTab().getEl(),
-                items: [{
-                    xtype: 'core-query-morequeryformpanel',
-                    items: panel.moreQueryFormItems
-                }]
-            });
-        };
-        win.show();
+        var me = this,view= me.getView();
+        this.queryWin = view.add({
+            xtype:'core-query-morequeryform',
+            queryItems: view.moreQueryFormItems
+        });
+        this.queryWin.show();
     },
     onQuery: function (btn) {
         var me = this,
         queryPanel = me.getView(),
         queryGrid = queryPanel.down('core-query-querygridpanel');
-
         queryGrid.store.loadPage(1);
+    },
+    onReSetClick:function(btn){
+        btn.ownerCt.ownerCt.reset();
+    },
+    onCloseClick:function(btn){
+        this.queryWin = Ext.destroy(this.queryWin);
     }
 });