~tjx/GsMesClient.git

			@@ -54,13 +54,10 @@
			this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
			this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
			this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
			this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
			toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
			toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
			toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
			List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
			gvList.Add(gridView1);
			Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
			this.toolBarMenu1.getXmlConfig();
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
			Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
			@@ -77,12 +74,7 @@
			getPageList(1);
			pageBar1.PagerEvent += PageBar1_PagerEvent;
			}
			private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
			{
			_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
			Task.Delay(100);
			getPageList(1);
			}

			/// <summary>
			/// 批准
			/// </summary>
			@@ -148,30 +140,7 @@
			{
			getPageList(curPage);
			}
			/// <summary>
			/// 查询事件
			/// </summary>
			/// <param name="sender"></param>
			/// <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();
			}
			/// <summary>
			/// 查询回调
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
			{
			_filterList = e.FilterList;
			getPageList(1);
			}

			/// <summary>
			/// 取消事件
			/// </summary>
			@@ -267,7 +236,7 @@
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gridViews);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
			}
			}
			/// <summary>
			@@ -282,7 +251,7 @@
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
			UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
			UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
			UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
			txt_createDate.Text = DateTime.Now.ToString("G");
			@@ -426,7 +395,7 @@
			List<GridView> gridViews = new List<GridView>();
			gridViews.Add(gvMx1);
			gridViews.Add(gvMx2);
			UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
			UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
			toolBarMenu1.currentAction = "";
			}
			}
			@@ -460,17 +429,15 @@
			if (dd.rtnCode > 0)
			{
			DataTable dt = dd.rtnData.list;
			gcMain.BindingContext = new BindingContext();
			gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
			gcMain1.BindingContext = new BindingContext();
			if (dt.Rows.Count > 0)
			{
			gcMain.DataSource = dt;
			gcMain.ForceInitialize();
			gcMain1.DataSource = dt;
			gcMain1.ForceInitialize();
			gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
			}
			else
			UtilityHelper.SetDefaultTable(gcMain, gridView1);
			gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
			UtilityHelper.SetDefaultTable(gcMain1, gridView1);
			pageBar1.TotalPages = dd.rtnData.pages;//总页
			pageBar1.CurrentPage = curPage;//当前页
			pageBar1.RecordCount = dd.rtnData.total;//总记录数
			@@ -510,7 +477,7 @@
			List<GridView> gvList = new List<GridView>();
			gvList.Add(gvMx1);
			gvList.Add(gvMx2);
			UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
			UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
			JObject _job = JObject.Parse(strJson);
			JArray array = new JArray();
			JArray mesQmAql3s = new JArray();
			@@ -556,6 +523,11 @@
			}
			}

			/// <summary>
			/// 删除字码
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gvMx1.CloseEditor();
			@@ -595,7 +567,11 @@
			}
			}
			}

			/// <summary>
			/// 删除方案
			/// </summary>
			/// <param name="sender"></param>
			/// <param name="e"></param>
			private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
			{
			gvMx2.CloseEditor();