Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient

wbc

2025-12-03 6940ba1b4fe555c94353de9d7ab6a53a6c8884bc

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs

@@ -1,4 +1,5 @@
using Gs.DevApp.Entity;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -27,16 +28,20 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
           }, tips);
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
            }, (value) =>
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            }, lbGuid, toolBarMenu1
            , () =>
            {
                ucRptQtrkdj1.Initialize();
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
        }
@@ -76,12 +81,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;
            }
            ucRptQtrkdj1.ToolBarMenu1_btnQueryClick(sender, e);
        }
        /// <summary>
        /// 查询回调
@@ -272,7 +282,8 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");