bug

lu

6 天以前 4e5a7feccdb468ba7a8dbfbe2eed08c00797f435

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs

@@ -34,7 +34,11 @@
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            }, lbGuid, toolBarMenu1
            , () =>
            {
                ucRptCgdhdPrint1.Initialize();
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //打印事件
@@ -171,12 +175,17 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                gridView1.ActiveFilter.Clear();
                gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
                frm.UpdateParent += Frm_UpdateParent;
                frm.ShowDialog();
                return;
            }
            ucRptCgdhdPrint1.ToolBarMenu1_btnQueryClick(sender, e);
        }
        /// <summary>
        /// 查询回调
@@ -196,20 +205,25 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            if (xtraTabControl1.SelectedTabPageIndex == 1)
                getModel(lbGuid.Text.Trim());
            else
            

            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                //_filterList.Clear();
                //if (gridView1.ActiveFilter.Count > 0)
                //{
                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                //    gridView1.ActiveFilter.Clear();
                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                //}
                //getPageList(1);
                getPageList(this.pageBar1.CurrentPage);
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(lbGuid.Text.Trim());
                return;
            }
            if (xtraTabControl1.SelectedTabPageIndex == 2)
            {
                ucRptCgdhdPrint1.ToolBarMenu1_btnLoadClick(sender, e);
                return;
            }


        }
        /// <summary>
        ///