~tjx/GsMesClient.git

			@@ -58,7 +58,7 @@
			this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_paperBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_shPeople = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -70,13 +70,13 @@
			this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
			this.txt_dhgRemark = new DevExpress.XtraEditors.TextEdit();
			this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
			this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
			this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
			this.lbGuid = new System.Windows.Forms.Label();
			this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
			this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
			this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
			this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
			this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
			this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
			this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
			this.txt_status = new DevExpress.XtraEditors.CheckEdit();
			this.txt_guid = new DevExpress.XtraEditors.TextEdit();
			@@ -136,8 +136,10 @@
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.ucRptCgrk1 = new Gs.DevApp.DevFrm.Rpt.ucRptCgrk();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -160,12 +162,12 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
			@@ -195,6 +197,7 @@
			this.xtraTabPage3.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			this.xtraTabPageReport.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
			this.SuspendLayout();
			//
			@@ -207,6 +210,7 @@
			this.toolBarMenu1.guidKey = null;
			this.toolBarMenu1.isSetBtn = false;
			this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
			this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
			this.toolBarMenu1.Name = "toolBarMenu1";
			this.toolBarMenu1.rptParameter = null;
			this.toolBarMenu1.Size = new System.Drawing.Size(1348, 80);
			@@ -224,7 +228,8 @@
			this.xtraTabControl1.TabIndex = 3;
			this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
			this.xtraTabPage1,
			this.xtraTabPage2});
			this.xtraTabPage2,
			this.xtraTabPageReport});
			//
			// xtraTabPage1
			//
			@@ -279,7 +284,7 @@
			this.gv_lastupdateDate,
			this.gv_remark,
			this.gv_paperBillNo,
			this.gv_checkUser,
			this.gv_shPeople,
			this.gv_checkDate,
			this.gridColumn3,
			this.bandedGridColumn2,
			@@ -455,17 +460,17 @@
			this.gv_paperBillNo.VisibleIndex = 13;
			this.gv_paperBillNo.Width = 120;
			//
			// gv_checkUser
			// gv_shPeople
			//
			this.gv_checkUser.AppearanceCell.Options.UseFont = true;
			this.gv_checkUser.Caption = "审核人 ";
			this.gv_checkUser.FieldName = "checkUser";
			this.gv_checkUser.Name = "gv_checkUser";
			this.gv_checkUser.OptionsColumn.AllowEdit = false;
			this.gv_checkUser.Tag = "query_a.CHECK_USER";
			this.gv_checkUser.Visible = true;
			this.gv_checkUser.VisibleIndex = 14;
			this.gv_checkUser.Width = 60;
			this.gv_shPeople.AppearanceCell.Options.UseFont = true;
			this.gv_shPeople.Caption = "审核人 ";
			this.gv_shPeople.FieldName = "shPeople";
			this.gv_shPeople.Name = "gv_shPeople";
			this.gv_shPeople.OptionsColumn.AllowEdit = false;
			this.gv_shPeople.Tag = "query_a.CHECK_USER";
			this.gv_shPeople.Visible = true;
			this.gv_shPeople.VisibleIndex = 14;
			this.gv_shPeople.Width = 60;
			//
			// gv_checkDate
			//
			@@ -555,13 +560,13 @@
			this.layoutMx1.Controls.Add(this.txt_dptName);
			this.layoutMx1.Controls.Add(this.txt_dhgRemark);
			this.layoutMx1.Controls.Add(this.txt_suppName);
			this.layoutMx1.Controls.Add(this.txt_checkUser);
			this.layoutMx1.Controls.Add(this.txt_checkUserName);
			this.layoutMx1.Controls.Add(this.lbGuid);
			this.layoutMx1.Controls.Add(this.txt_paperBillNo);
			this.layoutMx1.Controls.Add(this.txt_checkDate);
			this.layoutMx1.Controls.Add(this.txt_billNo);
			this.layoutMx1.Controls.Add(this.txt_cbillNo);
			this.layoutMx1.Controls.Add(this.txt_createBy);
			this.layoutMx1.Controls.Add(this.txt_createByName);
			this.layoutMx1.Controls.Add(this.txt_createDate);
			this.layoutMx1.Controls.Add(this.txt_status);
			this.layoutMx1.Controls.Add(this.txt_guid);
			@@ -608,14 +613,14 @@
			this.txt_suppName.TabIndex = 592;
			this.txt_suppName.Tag = "readonly";
			//
			// txt_checkUser
			// txt_checkUserName
			//
			this.txt_checkUser.Location = new System.Drawing.Point(1092, 12);
			this.txt_checkUser.Name = "txt_checkUser";
			this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
			this.txt_checkUser.Size = new System.Drawing.Size(242, 24);
			this.txt_checkUser.StyleController = this.layoutMx1;
			this.txt_checkUser.TabIndex = 595;
			this.txt_checkUserName.Location = new System.Drawing.Point(1092, 12);
			this.txt_checkUserName.Name = "txt_checkUserName";
			this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
			this.txt_checkUserName.Size = new System.Drawing.Size(242, 24);
			this.txt_checkUserName.StyleController = this.layoutMx1;
			this.txt_checkUserName.TabIndex = 595;
			//
			// lbGuid
			//
			@@ -662,14 +667,14 @@
			this.txt_cbillNo.StyleController = this.layoutMx1;
			this.txt_cbillNo.TabIndex = 507;
			//
			// txt_createBy
			// txt_createByName
			//
			this.txt_createBy.Location = new System.Drawing.Point(761, 12);
			this.txt_createBy.Name = "txt_createBy";
			this.txt_createBy.Properties.Appearance.Options.UseFont = true;
			this.txt_createBy.Size = new System.Drawing.Size(240, 24);
			this.txt_createBy.StyleController = this.layoutMx1;
			this.txt_createBy.TabIndex = 219;
			this.txt_createByName.Location = new System.Drawing.Point(761, 12);
			this.txt_createByName.Name = "txt_createByName";
			this.txt_createByName.Properties.Appearance.Options.UseFont = true;
			this.txt_createByName.Size = new System.Drawing.Size(240, 24);
			this.txt_createByName.StyleController = this.layoutMx1;
			this.txt_createByName.TabIndex = 219;
			//
			// txt_createDate
			//
			@@ -806,7 +811,7 @@
			//
			// layoutControlItem3
			//
			this.layoutControlItem3.Control = this.txt_createBy;
			this.layoutControlItem3.Control = this.txt_createByName;
			this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
			this.layoutControlItem3.Name = "layoutControlItem3";
			this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
			@@ -827,7 +832,7 @@
			//
			// layoutControlItem5
			//
			this.layoutControlItem5.Control = this.txt_checkUser;
			this.layoutControlItem5.Control = this.txt_checkUserName;
			this.layoutControlItem5.Location = new System.Drawing.Point(993, 0);
			this.layoutControlItem5.Name = "layoutControlItem5";
			this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
			@@ -1092,7 +1097,7 @@
			// gridColumn5
			//
			this.gridColumn5.Caption = "建立者";
			this.gridColumn5.FieldName = "createBy";
			this.gridColumn5.FieldName = "createByName";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Visible = true;
			@@ -1313,7 +1318,7 @@
			// gridColumn7
			//
			this.gridColumn7.Caption = "建立者";
			this.gridColumn7.FieldName = "createBy";
			this.gridColumn7.FieldName = "createByName";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			@@ -1337,6 +1342,14 @@
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Width = 94;
			//
			// xtraTabPageReport
			//
			this.xtraTabPageReport.Controls.Add(this.ucRptCgrk1);
			this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
			this.xtraTabPageReport.Name = "xtraTabPageReport";
			this.xtraTabPageReport.Size = new System.Drawing.Size(1346, 570);
			this.xtraTabPageReport.Text = "明细报表";
			//
			// picCheckBox
			//
			this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
			@@ -1347,6 +1360,14 @@
			this.picCheckBox.TabIndex = 6;
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			// ucRptCgrk1
			//
			this.ucRptCgrk1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.ucRptCgrk1.Location = new System.Drawing.Point(0, 0);
			this.ucRptCgrk1.Name = "ucRptCgrk1";
			this.ucRptCgrk1.Size = new System.Drawing.Size(1346, 570);
			this.ucRptCgrk1.TabIndex = 0;
			//
			// Frm_MesInvItemIns
			//
			@@ -1380,12 +1401,12 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
			@@ -1415,6 +1436,7 @@
			this.xtraTabPage3.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			this.xtraTabPageReport.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
			this.ResumeLayout(false);

			@@ -1435,7 +1457,7 @@
			private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
			private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
			private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
			private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
			private DevExpress.XtraGrid.Columns.GridColumn gv_shPeople;
			private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
			private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo;
			private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
			@@ -1450,13 +1472,13 @@
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraEditors.TextEdit txt_billNo;
			private DevExpress.XtraEditors.TextEdit txt_cbillNo;
			private DevExpress.XtraEditors.TextEdit txt_createBy;
			private DevExpress.XtraEditors.TextEdit txt_createByName;
			private DevExpress.XtraEditors.TextEdit txt_createDate;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraEditors.TextEdit txt_checkUser;
			private DevExpress.XtraEditors.TextEdit txt_checkUserName;
			private DevExpress.XtraEditors.TextEdit txt_dptName;
			private DevExpress.XtraEditors.TextEdit txt_suppName;
			private DevExpress.XtraEditors.TextEdit txt_checkDate;
			@@ -1520,5 +1542,7 @@
			private DevExpress.Utils.ToolTipController tips;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
			private Rpt.ucRptCgrk ucRptCgrk1;
			}
			}