查询界面界面调整

frontend/saas-web/app/util/QueryUtil.js

@@ -95,7 +95,7 @@ Ext.define('saas.util.QueryUtil', {
 					} else {
 						condition += ' AND ' + f.name + endChar + f.value;
 					}
-				} else if(f.xtype == 'combo' && f.value == '$ALL'){
+				} else if(f.xtype == 'combo' && f.value != '$ALL'){
 					if(f.store.data.length > 1) {
 						if(condition == ''){
 							condition += '(';
@@ -106,9 +106,9 @@ Ext.define('saas.util.QueryUtil', {
 						f.store.each(function(d, idx){
 							if(d.data.value != '$ALL') {
 								if(_a == ''){
-									_a += f.name + "='" + d.data.value + "'";
+									_a += f.name +' '+  d.data.value+' ' ;
 								} else {
-									_a += ' OR ' + f.name + "='" + d.data.value + "'";
+									_a += ' OR ' + f.name +' '+ d.data.value +' ';
 								}
 							}
 						});
@@ -183,14 +183,8 @@ Ext.define('saas.util.QueryUtil', {
      */
     queryData: function(grid,condition){
         var me = this;
-        //判断是否加载数据
-        //      url = config.url,
-        //     params = config.params,
-        //     async = config.async || true,
-        //     method = config.method || 'GET',
-        //     timeout = config.timeout || 8000;
             if(Ext.isEmpty(condition)){
-                condition ="1=1";
+                condition =" 1=1 ";
             }
             var params = { keyword: condition,number:1,size:15 };
             var dataRes = {
@@ -214,33 +208,41 @@ Ext.define('saas.util.QueryUtil', {
             });
     },
     onQuery: function(parentForm,queryMoreForm){
-        var grid = parentForm.down('grid'),
-            condition = me.QueryUtil.getFormCondition(queryForm),
-            Mode = me.QueryUtil.getStoreMode(queryForm);
+        var me = this,
+            grid = parentForm.down('grid'),
+            queryForm = parentForm.down('form'),
+            condition = me.getFormCondition(queryForm),
+            Mode = me.getStoreMode(queryForm);
         if(queryMoreForm){//更多查询
             if(!Ext.isEmpty(condition)){
-                condition = " and ( "+me.QueryUtil.getStoreMode(queryMoreForm)+" ) ";
+                condition = " and ( "+me.getStoreMode(queryMoreForm)+" ) ";
             }else{
-                condition = me.QueryUtil.getStoreMode(queryMoreForm);
+                condition = me.getStoreMode(queryMoreForm);
             }
             if(Mode=="MAIN"){
-                me.QueryUtil.getStoreMode(queryMoreForm);
+                me.getStoreMode(queryMoreForm);
             }
         }
         console.log("condition:"+condition);
         condition = " 1=1 ";
         if(Mode=="MAIN"){
             console.log("Mode:"+Mode+"，查询当前列表");
-            me.queryData(grid,condition);
+            grid.loadPage(1);
         }else{
             console.log("Mode:"+Mode+"，查询当前关联列表");
             //若明细字段含明细字段注意切换数据源 grid.reconfigure(store, columns);
             //关联viewName = 关联viewName+"-RelativeGrid"
-            var viewName = parentForm.viewName+"-RelativeGrid";
-                console.log("grid:");
-                console.log(grid);
-                me.GridUtil.setColumns(grid,"http://192.168.0.181:8560/api/ui/co_view/config?name="+viewName);
+            grid.loadPage(1);
         }
 
+    },
+    add10EmptyRow: function(grid) {
+        var store = grid.getStore(),
+            selectedRecord = grid.selModel.lastSelected,
+            datas = [];
+        Ext.Array.each(new Array(10), function() {
+            datas.push({});
+        })
+        store.insert(store.indexOf(selectedRecord) + 1, datas);
     }
 });

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

@@ -18,8 +18,9 @@ Ext.define('saas.view.core.query.FormPanel', {
     border: 1,
     frame:true,
     margin:'0',
+    remoteConfig:false,
     initComponent: function() {
-        var me = this,
+        var me = this;
         remoteConfig = me.remoteConfig;
         remoteConfig && me.QueryUtil.setItems(me);
         me.callParent(arguments);

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

@@ -1,4 +1,6 @@
 Ext.define('saas.view.core.query.FormPanelModel', {
     extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-query-formpanel'
+    alias: 'viewmodel.core-query-formpanel',
+
+
 });

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

@@ -2,13 +2,8 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-query-queryformpanel',
 
-    viewModel: 'core-query-queryformpanel',
-
      //字段属性
     _baseItems: [],
-    _codeField: '',
-    _statusField: '',
-    _idField: '',
      
     //基础属性
     layout: 'column',
@@ -29,28 +24,31 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
         columnWidth: 0.25,
         blankText: '该字段不能为空'
     },
-
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'bottom',
-        style: {
-            'border-bottom': '1px solid #35baf6 !important'
-        },
-        items: ['->',{
-            xtype: 'button',
-            text: '更多查询',
-            handler: me.moreQuery
-        }, {
-            xtype: 'button',
-            text: '查询',
-            handler: me.onQuery
-        },'->']
-    }],
-    
-    remoteConfig: false, // 是否需要从远端读取form配置
-    bindFields: [], // 已绑定字段（需要保存到数据库）
+    initComponent: function() {
+        var me = this;
+        Ext.apply(me,{
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'bottom',
+                style: {
+                    'border-bottom': '1px solid #35baf6 !important'
+                },
+                items: ['->',{
+                    xtype: 'button',
+                    text: '更多查询',
+                    handler: me.moreQuery
+                }, {
+                    xtype: 'button',
+                    text: '查询',
+                    handler: me.onQuery
+                },'->']
+            }]
+        });
+        me.callParent(arguments);
+    },
     moreQuery: function(btn){
         var win = Ext.getCmp('queryMoreWin');
+        debugger;
         if(!win){
             win = Ext.create('Ext.window.Window', {
             id:'queryMoreWin', 
@@ -65,8 +63,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             layout:'fit',
             renderTo:Ext.getCmp('main-tab-panel').getActiveTab().getEl(),
             items:[{
-                xtype:'core-query-querymoreformpanel',
-                viewName:btn.ownerCt.ownerCt.ownerCt.viewName+"-moreQuery",
+                xtype:btn.ownerCt.ownerCt.ownerCt.xtype+"-moreQuery"
             }]
         });
     };
@@ -74,6 +71,7 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
     },
     onQuery: function(btn){
         console.log("查询");
+        debugger;
         var me = this,
             parentForm = btn.ownerCt.ownerCt.ownerCt;
             parentForm.QueryUtil.onQuery(parentForm);

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

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.query.QueryFormPanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-query-queryformpanel'
-});

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

@@ -2,9 +2,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     extend: 'Ext.grid.Panel',
     xtype: 'core-query-gridpanel',
     
-    //工具类
-    GridUtil: Ext.create('saas.util.GridUtil'),
-    
     //字段属性
     _codeField: '',
     _statusField: '',
@@ -12,7 +9,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     _BaseColumn: '',
     _RelativeColumn: '',
     //数据属性
-    listUrl:'http://192.168.0.181:8560/api/purchase/purchase/list',
+    listUrl:'http://192.168.253.58:8800/purchase/list',
 
     //基础属性
     border: 1,
@@ -22,12 +19,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     showIndex: true,
     columnWidth:1.0,
     showRowNum:true,
-	autoQuery: true,
     selModel:'checkboxmodel',
-    store: {
-        data: []
-    },
-   
     initComponent: function() {
         var me = this;
         Ext.apply(me, {
@@ -51,15 +43,61 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     handler: me.onDelete
                 }]
             }],
+            store:Ext.create('Ext.data.Store',{
+                fields:me.fields,
+                autoLoad: true,
+                pageSize:5,
+                data:[],
+                proxy:{
+                    type:'ajax',
+                    url:me.listUrl ,
+                    actionMethods: {
+                        read   : 'GET'
+                    },
+                    reader:{
+                        type:'json',
+                        rootProperty:'data.list'
+                        ,totalProperty:'data.total',
+                        }
+                },
+                listeners : {
+                    beforeload : function(store,op) {
+                        var condition = '';
+                        // var queryForm = Ext.getCmp('core-query-queryformpanel'),
+                        // queryMoreForm = Ext.getCmp('core-query-querymoreformpanel'),
+                        // condition = me.up('core-query-formpanel').QueryUtil.getFormCondition(queryForm);
+                        // if(queryMoreForm){//更多查询
+                        //     if(!Ext.isEmpty(condition)){
+                        //         condition = " and ( "+me.up('core-query-formpanel').QueryUtil.getStoreMode(queryMoreForm)+" ) ";
+                        //     }else{
+                        //         condition = me.getStoreMode(queryMoreForm);
+                        //     }
+                        // }
+                        if(Ext.isEmpty(condition)){
+                            condition = " 1=1 ";
+                        }
+                        console.log("condition:"+condition);
+                        Ext.apply(store.proxy.extraParams, {
+                            number:op._start+1,
+                            size:store.pageSize,
+                            keyword: condition
+                        });
+                        
+                    }
+                }
+            }),
             bbar: {
                 xtype: 'pagingtoolbar',
+                id:'query-bbar',
+                store:me.store,
                 displayInfo: true,
-                displayMsg: 'Displaying topics {0} - {1} of {2}',
+                displayMsg:'当前显示第{0}到{1}条数据,一共有{2}条',
                 emptyMsg: "暂无数据",
+                beforePageText: "当前第",
+				afterPageText: "页,共{0}页"
             },
-            store: me.setStore()
         });
-        me.listUrl && me.up('core-query-formpanel').QueryUtil.queryData(me);
+        //me.listUrl && me.up('core-query-formpanel').QueryUtil.queryData(me);
         me.callParent(arguments);
     },
 
@@ -67,7 +105,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         afterrender: function(grid) {
             //没数据先暂时这样处理下
             if(grid.store.count()==0){
-                grid.add10EmptyRow();
+                grid.up('core-query-formpanel').QueryUtil.add10EmptyRow(grid);
             }
         },
         itemClick: function(tableView, record, item, index, e, eOpts) {
@@ -78,30 +116,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 console.log(store);
         }
     },
-    add10EmptyRow: function() {
-        var me = this,
-            store = me.getStore(),
-            selectedRecord = me.selModel.lastSelected,
-            datas = [];
-        Ext.Array.each(new Array(10), function() {
-            datas.push({});
-        })
-        store.insert(store.indexOf(selectedRecord) + 1, datas);
-    },
-    setStore:function(){
-        var me=this;
-        var store =  {
-                data: []
-            };
-        if(me.fields){
-            var store=Ext.create('Ext.data.Store',{
-                fields:me.fields,
-                autoLoad: true,
-                data :[]
-            });
-        }
-        return store;
-    },
     onAddMore: function(btn) {
         console.log("跳转到主从表");
     },

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

@@ -1,8 +1,7 @@
 Ext.define('saas.view.core.query.QueryMoreFormPanel', {
     extend: 'Ext.form.Panel',
     xtype: 'core-query-querymoreformpanel',
-
-    viewModel: 'core-query-querymoreformpanel',
+    viewModel: 'core-query-formpanel',
     //字段属性
     _codeField: '',
     _statusField: '',
@@ -37,18 +36,18 @@ Ext.define('saas.view.core.query.QueryMoreFormPanel', {
         items: [{
             xtype: 'button',
             text: '重置',
-            handler: me.resetQuery
+            handler: this.resetQuery
         },'->',{
             xtype: 'button',
             text: '查询',
-            handler: me.onQueryMore
+            handler: this.onQueryMore
         }, {
             xtype: 'button',
             text: '关闭',
             handler: function(btn){
                 var win = Ext.getCmp('queryMoreWin');
                 win.close();
-				win.destroy();
+				//win.destroy();
             }
         }]
     }],

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

@@ -1,4 +0,0 @@
-Ext.define('saas.view.core.query.QueryMoreFormPanelModel', {
-    extend: 'Ext.app.ViewModel',
-    alias: 'viewmodel.core-query-querymoreformpanel'
-});

frontend/saas-web/app/view/test/query/FormController.js

@@ -1,10 +1,9 @@
 Ext.define('saas.view.test.query.FormController', {
-    extend: 'saas.view.core.query.FormPanelController',
+    extend: 'Ext.app.ViewController',
     alias: 'controller.test-query-formcontroller',
     init: function (view) {
         var me = this;
         this.control({
         });
-
     }
 });

frontend/saas-web/app/view/test/query/FormModel.js

@@ -1,9 +0,0 @@
-Ext.define('saas.view.test.query.FormModel', {
-    extend: 'saas.view.core.query.FormPanelModel',
-    alias: 'viewmodel.test-query-formmodel',
-
-    // data: {
-    //     'core-query-gridpanel': []
-    // }
-
-});

frontend/saas-web/app/view/test/query/FormPanel.js

@@ -3,8 +3,7 @@ Ext.define('saas.view.test.query.FormPanel', {
     xtype: 'test-query-formpanel',
 
     controller: 'test-query-formcontroller',
-    viewModel: 'test-query-formmodel',
-    viewName:'test-query-formpanel',
+   // viewModel: 'test-query-formmodel',
 
     //字段属性
     _codeField: 'pu_code',
@@ -15,28 +14,20 @@ Ext.define('saas.view.test.query.FormPanel', {
         xtype: 'core-query-queryformpanel',
         //_baseItems
         items:[
-            {
-                xtype: 'hidden',
-                name: 'pu_id',
-                bind:'{pu_id}',
-                fieldLabel: 'ID',
-                allowBlank: true,
-                columnWidth: 0
-            },
             {
                 xtype: 'dbfindtrigger',
                 name: 'pu_code',
-                bind:'{pu_code}',
                 fieldLabel: '单据编号',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                bind:'{pu_code}',
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'condatefield',
                 name: 'pu_date',
-                bind: '{pu_date}',
+                bind:'{pu_date}',
                 fieldLabel: '采购日期',
                 allowBlank: true,
                 columnWidth: 0.5
@@ -44,87 +35,106 @@ Ext.define('saas.view.test.query.FormPanel', {
             {
                 xtype: 'dbfindtrigger',
                 name: 'pu_vendcode',
-                bind: '{pu_vendcode}',
+                bind:'{pu_vendcode}',
                 fieldLabel: '供应商编号',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                value:'1234',
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'textfield',
                 name: 'pu_vendname',
-                bind: '{pu_vendname}',
+                bind:'{pu_vendname}',
                 fieldLabel: '供应商名称',
                 allowBlank: true,
+                value:'4321',
                 columnWidth: 0.25
             },
             {
                 xtype: 'dbfindtrigger',
                 name: 'pd_prodcode',
-                bind: '{pd_prodcode}',
+                bind:'{pd_prodcode}',
                 fieldLabel: '物料编号',
                 fieldMode: 'DETAIL',
                 allowBlank: true,
                 columnWidth: 0.25,
-                configUrl: resources/json/purchase/vendorColumnsDbfind.json,
-                dataUrl: resources/json/purchase/vendorDataDbfind.json
+                configUrl: 'resources/json/purchase/vendorColumnsDbfind.json',
+                dataUrl: 'resources/json/purchase/vendorDataDbfind.json'
             },
             {
                 xtype: 'textfield',
                 name: 'pr_detail',
-                bind: '{pr_detail}',
+                bind:'{pr_detail}',
                 fieldLabel: '物料名称',
                 allowBlank: true,
                 columnWidth: 0.25
             },
             {
-                xtype: 'remotecombo',
+                xtype: 'combobox',
                 name:'pr_statuscode',
-                bind: '{pr_statuscode}',
+                bind:'{pr_statuscode}',
                 fieldLabel: '审核状态',
                 allowBlank: true,
                 columnWidth: 0.25,
+                queryMode: 'local',
+                displayField: 'pr_status',
+                valueField: 'pr_statuscode',
                 store: Ext.create('Ext.data.Store', {
                     fields: ['pr_statuscode', 'pr_status'],
-                    queryMode: 'local',
-                    displayField: 'pr_status',
-                    valueField: 'pr_statuscode',
                     data :[
                         ["$ALL","全部"],
-                        ["=AUDITED" ,"已审核"],
-                        ["<>AUDITED","未审核"]
+                        ["= 'AUDITED'" ,"已审核"],
+                        ["<> 'AUDITED'","未审核"]
                     ]
                 })
             },
             {
-                xtype: 'remotecombo',
+                xtype: 'combobox',
                 name: 'pu_acceptstatuscode',
-                bind: '{pu_acceptstatuscode}',
+                bind:'{pu_acceptstatuscode}',
                 fieldLabel: '入库状态',
                 allowBlank: true,
                 columnWidth: 0.25,
+                queryMode: 'local',
+                displayField: 'pu_acceptstatus',
+                valueField: 'pu_acceptstatuscode',
                 store: Ext.create('Ext.data.Store', {
                     fields: ['pu_acceptstatuscode', 'pu_acceptstatus'],
-                    queryMode: 'local',
-                    displayField: 'pu_acceptstatus',
-                    valueField: 'pu_acceptstatuscode',
                     data :[
                         ["$ALL","全部"],
-                        ["=TURNOUT","已入库"],
-                        ["=NULL","未入库"],
-                        ["=PARTOUT","部分入库"]
+                        ["= 'TURNOUT'","已入库"],
+                        ["is NULL","未入库"],
+                        ["= 'PARTOUT'","部分入库"]
                     ]
                 })
             }
         ]
     },{
         xtype: 'core-query-gridpanel',
+        fields:[
+            {
+                name : 'pu_id'
+            },{
+                name : 'pu_code'
+            },{
+                name : 'pu_status'
+            },{
+                name : 'pu_date'
+            },{
+                name : 'pu_vendcode'
+            },{
+                name : 'pu_vendname'
+            },{
+                name : 'pu_taxtotal'
+            }
+        ],
         columns: [
             {
                 text: '序号',
                 width: 80,
-                xtype: rownumberer
+                xtype: 'rownumberer'
             },
             {
                 text: 'id',
@@ -142,25 +152,30 @@ Ext.define('saas.view.test.query.FormPanel', {
                 dataIndex: 'pu_status',
                 width: 120
             }
-            //,
-            // {
-            //     text: 下单时间,
-            //     dataIndex: puDate,
-            //     width: 120,
-            //     xtype: datecolumn
-            // },
-            // {
-            //     text: 供应商名称,
-            //     dataIndex: puVendname,
-            //     width: 200
-            // },
-            // {
-            //     text: 含税金额,
-            //     dataIndex: puTaxtotal,
-            //     width: 120,
-            //     xtype: numbercolumn,
-            //     flex: 1
-            // }
+            ,
+            {
+                text: '下单时间',
+                dataIndex: 'pu_date',
+                width: 120,
+                xtype: 'datecolumn'
+            },
+            {
+                text: '供应商编号',
+                dataIndex: 'pu_vendcode',
+                width: 200
+            },
+            {
+                text: '供应商名称',
+                dataIndex: 'pu_vendname',
+                width: 200
+            },
+            {
+                text: '含税金额',
+                dataIndex: 'pu_taxtotal',
+                width: 120,
+                xtype: 'numbercolumn',
+                flex: 1
+            }
         ]
     }]
 });

frontend/saas-web/app/view/test/query/QueryFormPanel.js

@@ -1,77 +1,37 @@
 Ext.define('saas.view.test.query.QueryFormPanel', {
-    extend: 'Ext.form.Panel',
-    xtype: 'test-query-queryformpanel',
+    extend: 'saas.view.core.query.QueryMoreFormPanel',
+    xtype: 'test-query-formpanel-moreQuery',
 
     QueryUtil: Ext.create('saas.util.QueryUtil'),
 
-    viewModel: 'test-query-queryformpanel',
-    viewName:'',
-    layout: 'column',
-    autoScroll: true,
-    anchor: '100% 30%',
-    buttonAlign : 'center',
-    bodyPadding: 5,
-    labelSeparator : ':',
-    defaults:{
-		xtype:'textfield',
-		columnWidth:0.33,
-		margin:'5 5 5 5'
-	},
-    fieldDefaults: {
-        margin: '0 5 5 0',
-        labelAlign: 'right',
-        labelWidth: 90,
-        columnWidth: 0.25,
-        blankText: '该字段不能为空'
-    },
-
-    dockedItems: [{
-        xtype: 'toolbar',
-        dock: 'bottom',
-        style: {
-            'border-bottom': '1px solid #35baf6 !important'
-        },
-        items: ['->',{
-            xtype: 'button',
-            text: '更多查询',
-            handler: me.moreQuery
-        }, {
-            xtype: 'button',
-            text: '查询',
-            handler: me.onQuery
-        },'->']
-    }],
-    
-    remoteConfig: false, // 是否需要从远端读取form配置
-    bindFields: [], // 已绑定字段（需要保存到数据库）
-    moreQuery: function(btn){
-        var win = Ext.getCmp('queryMoreWin');
-        if(!win){
-            win = Ext.create('Ext.window.Window', {
-            id:'queryMoreWin', 
-            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-querymoreformpanel',
-                viewName:btn.ownerCt.ownerCt.ownerCt.viewName+"-moreQuery",
-                items:[]
-            }]
-        });
-    };
-        win.show();
-    },
-    onQuery: function(btn){
-        console.log("查询");
-        var me = this,
-            parentForm = btn.ownerCt.ownerCt.ownerCt;
-        me.QueryUtil.onQuery(parentForm);
+   //字段属性
+   _codeField: '',
+   _statusField: '',
+   _idField: '',
+   _baseItems: '',
+   items:[{
+        xtype: 'textfield',
+        name: 'pu_buyername',
+        bind: '{pu_buyername}',
+        fieldLabel: '采购员',
+        allowBlank: true,
+        columnWidth: 0.25
+    },	 
+    {	 
+        xtype: 'textfield',
+        name: 'pu_total',
+        bind: '{pu_total}',
+        fieldLabel: '金额',
+        allowBlank: true,
+        columnWidth: 0.25
+    },	 
+    {	 
+        xtype: 'condatefield',
+        name: 'pu_delivery',
+        bind: '{pu_delivery}',
+        fieldLabel: '交货日期',
+        allowBlank: true,
+        columnWidth: 0.25
     }
+    ]
 });