~tjx/GsMesClient.git

			@@ -93,6 +93,7 @@
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
			this.tabMx = new DevExpress.XtraTab.XtraTabControl();
			this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx1 = new DevExpress.XtraGrid.GridControl();
			@@ -121,7 +122,6 @@
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -174,6 +174,7 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
			this.tabMx.SuspendLayout();
			this.tabMxPage1.SuspendLayout();
			@@ -182,7 +183,6 @@
			this.tabMxPage2.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
			this.SuspendLayout();
			//
			// toolBarMenu1
			@@ -859,6 +859,18 @@
			this.layoutControlItem16.Text = "违规类别";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.ucBtnPrint98;
			this.layoutControlItem13.Location = new System.Drawing.Point(990, 99);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
			this.layoutControlItem13.Text = "确定打印";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem13.TextVisible = false;
			//
			// tabMx
			//
			this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
			@@ -984,7 +996,7 @@
			//
			this.tabMxPage2.Controls.Add(this.gcMx2);
			this.tabMxPage2.Name = "tabMxPage2";
			this.tabMxPage2.Size = new System.Drawing.Size(1361, 332);
			this.tabMxPage2.Size = new System.Drawing.Size(1361, 376);
			this.tabMxPage2.Text = "追溯码明细";
			//
			// gcMx2
			@@ -993,7 +1005,7 @@
			this.gcMx2.Location = new System.Drawing.Point(0, 0);
			this.gcMx2.MainView = this.gvMx2;
			this.gcMx2.Name = "gcMx2";
			this.gcMx2.Size = new System.Drawing.Size(1361, 332);
			this.gcMx2.Size = new System.Drawing.Size(1361, 376);
			this.gcMx2.TabIndex = 2;
			this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gvMx2});
			@@ -1100,7 +1112,7 @@
			// gridColumn12
			//
			this.gridColumn12.Caption = "绑定时间";
			this.gridColumn12.FieldName = "dhdh";
			this.gridColumn12.FieldName = "bdDateTime";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			@@ -1110,7 +1122,7 @@
			// gridColumn5
			//
			this.gridColumn5.Caption = "绑定人";
			this.gridColumn5.FieldName = "bdDateTime";
			this.gridColumn5.FieldName = "bdUserBy";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Visible = true;
			@@ -1156,18 +1168,6 @@
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 11;
			this.gridColumn9.Width = 94;
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.ucBtnPrint98;
			this.layoutControlItem13.Location = new System.Drawing.Point(990, 99);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
			this.layoutControlItem13.Text = "确定打印";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem13.TextVisible = false;
			//
			// Frm_WomFanGong
			//
			@@ -1230,6 +1230,7 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
			this.tabMx.ResumeLayout(false);
			this.tabMxPage1.ResumeLayout(false);
			@@ -1238,7 +1239,6 @@
			this.tabMxPage2.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
			this.ResumeLayout(false);

			}