合并冲突

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

@@ -1,16 +1,11 @@
 Ext.define('saas.view.core.query.QueryGridPanel', {
     extend: 'Ext.grid.Panel',
-<<<<<<< HEAD
-    xtype: 'core-query-gridpanel',
-    
-=======
     xtype: 'core-query-querygridpanel',
 
     //工具类
     QueryUtil: Ext.create('saas.util.QueryUtil'),
     GridUtil: Ext.create('saas.util.GridUtil'),
 
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
     //字段属性
     _BaseColumn: '',
     _RelativeColumn: '',
@@ -18,11 +13,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     _printUrl:'',
     _deleteUrl:'',
     //数据属性
-<<<<<<< HEAD
     listUrl:'http://192.168.253.58:8800/purchase/list',
-=======
-    listUrl: 'http://192.168.0.181:8560/api/purchase/purchase/list',
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
 
     //基础属性
     border: 1,
@@ -30,17 +21,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     loadMask: true,
     frame: true,
     showIndex: true,
-<<<<<<< HEAD
-    columnWidth:1.0,
-    showRowNum:true,
-    selModel:'checkboxmodel',
-    initComponent: function() {
-        var me = this;
-        Ext.apply(me, {
-            _codeField: me.up('core-query-formpanel')._codeField,
-            _statusField: me.up('core-query-formpanel')._statusField,
-            _idField: me.up('core-query-formpanel')._idField,
-=======
     columnWidth: 1.0,
     showRowNum: true,
     autoQuery: true,
@@ -82,28 +62,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     }
                 }
             }),
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
-            dockedItems: [{
-                xtype: 'toolbar',
-                dock: 'top',
-                items: ['->', {
-                    text: '新增',
-                    handler: me.onAddMore
-                }, {
-                    text: '审核',
-                    handler: me.onAudit
-                }, {
-                    text: '打印',
-                    handler: me.onPrint
-                }, {
-                    text: '导出',
-                    handler: me.onExport
-                }, {
-                    text: '删除',
-                    handler: me.onDelete
-                }]
-<<<<<<< HEAD
-            }],
             store:Ext.create('Ext.data.Store',{
                 fields:me.fields,
                 autoLoad: true,
@@ -147,19 +105,25 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     }
                 }
             }),
-            bbar: {
-                xtype: 'pagingtoolbar',
-                id:'query-bbar',
-                store:me.store,
-                displayInfo: true,
-                displayMsg:'当前显示第{0}到{1}条数据,一共有{2}条',
-                emptyMsg: "暂无数据",
-                beforePageText: "当前第",
-				afterPageText: "页,共{0}页"
-            },
-        });
-        //me.listUrl && me.up('core-query-formpanel').QueryUtil.queryData(me);
-=======
+            dockedItems: [{
+                xtype: 'toolbar',
+                dock: 'top',
+                items: ['->', {
+                    text: '新增',
+                    handler: me.onAddMore
+                }, {
+                    text: '审核',
+                    handler: me.onAudit
+                }, {
+                    text: '打印',
+                    handler: me.onPrint
+                }, {
+                    text: '导出',
+                    handler: me.onExport
+                }, {
+                    text: '删除',
+                    handler: me.onDelete
+                }]
             }, {
                 xtype: 'pagingtoolbar',
                 dock: 'bottom',
@@ -172,22 +136,11 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 afterPageText: "页,共{0}页"
             }],
         });
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
         me.callParent(arguments);
     },
 
     listeners: {
-<<<<<<< HEAD
-        afterrender: function(grid) {
-            //没数据先暂时这样处理下
-            if(grid.store.count()==0){
-                grid.up('core-query-formpanel').QueryUtil.add10EmptyRow(grid);
-            }
-        },
-        itemClick: function(tableView, record, item, index, e, eOpts) {
-=======
         itemClick: function (tableView, record, item, index, e, eOpts) {
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
             var grid = tableView.up('grid'),
                 _idField = grid._idField,
                 store = grid.store,
@@ -196,9 +149,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             console.log(store);
         }
     },
-<<<<<<< HEAD
-    onAddMore: function(btn) {
-=======
 
     getFields: function() {
         var me = this;
@@ -210,7 +160,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         });
     },
     onAddMore: function (btn) {
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
         console.log("跳转到主从表");
         var form = btn.ownerCt.ownerCt;
         var mainTab = Ext.getCmp('main-tab-panel'),
@@ -227,12 +176,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             mainTab.setActiveTab(existingItem);
         }
     },
-<<<<<<< HEAD
     onAudit: function(btn){
         var grid = btn.ownerCt.ownerCt;
-=======
-    onAudit: function () {
->>>>>>> 7c5dfe2f93101106a65e7bc92f00b16a03418280
         console.log("审核");
         console.log("grid");
         var selectsd = grid.up('core-query-formpanel').QueryUtil.getGridSelected(grid);