~tjx/GsMesClient.git

			@@ -470,7 +470,7 @@
			this.gv_billType.OptionsColumn.AllowEdit = false;
			this.gv_billType.Tag = "query_a.BILL_TYPE";
			this.gv_billType.Visible = true;
			this.gv_billType.VisibleIndex = 16;
			this.gv_billType.VisibleIndex = 14;
			this.gv_billType.Width = 94;
			//
			// gv_billNo
			@@ -496,7 +496,7 @@
			this.gv_salesOrg.OptionsColumn.AllowEdit = false;
			this.gv_salesOrg.Tag = "query_a.SALES_ORG";
			this.gv_salesOrg.Visible = true;
			this.gv_salesOrg.VisibleIndex = 15;
			this.gv_salesOrg.VisibleIndex = 13;
			this.gv_salesOrg.Width = 94;
			//
			// gv_salesDept
			@@ -540,7 +540,7 @@
			//
			this.gv_createdBy.AppearanceCell.Options.UseFont = true;
			this.gv_createdBy.Caption = "创建人 ";
			this.gv_createdBy.FieldName = "createdBy";
			this.gv_createdBy.FieldName = "cjPeople";
			this.gv_createdBy.MinWidth = 50;
			this.gv_createdBy.Name = "gv_createdBy";
			this.gv_createdBy.OptionsColumn.AllowEdit = false;
			@@ -571,8 +571,6 @@
			this.gv_modifiedBy.Name = "gv_modifiedBy";
			this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
			this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
			this.gv_modifiedBy.Visible = true;
			this.gv_modifiedBy.VisibleIndex = 9;
			this.gv_modifiedBy.Width = 94;
			//
			// gv_modifiedDate
			@@ -584,21 +582,19 @@
			this.gv_modifiedDate.Name = "gv_modifiedDate";
			this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
			this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
			this.gv_modifiedDate.Visible = true;
			this.gv_modifiedDate.VisibleIndex = 10;
			this.gv_modifiedDate.Width = 94;
			//
			// gv_approvedBy
			//
			this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
			this.gv_approvedBy.Caption = "审核人 ";
			this.gv_approvedBy.FieldName = "approvedBy";
			this.gv_approvedBy.FieldName = "shPeople";
			this.gv_approvedBy.MinWidth = 50;
			this.gv_approvedBy.Name = "gv_approvedBy";
			this.gv_approvedBy.OptionsColumn.AllowEdit = false;
			this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
			this.gv_approvedBy.Visible = true;
			this.gv_approvedBy.VisibleIndex = 11;
			this.gv_approvedBy.VisibleIndex = 9;
			this.gv_approvedBy.Width = 94;
			//
			// gv_approvedDate
			@@ -611,7 +607,7 @@
			this.gv_approvedDate.OptionsColumn.AllowEdit = false;
			this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
			this.gv_approvedDate.Visible = true;
			this.gv_approvedDate.VisibleIndex = 12;
			this.gv_approvedDate.VisibleIndex = 10;
			this.gv_approvedDate.Width = 94;
			//
			// gridColumn18
			@@ -650,7 +646,7 @@
			this.gridColumn25.MinWidth = 25;
			this.gridColumn25.Name = "gridColumn25";
			this.gridColumn25.Visible = true;
			this.gridColumn25.VisibleIndex = 13;
			this.gridColumn25.VisibleIndex = 11;
			this.gridColumn25.Width = 94;
			//
			// gridColumn26
			@@ -660,7 +656,7 @@
			this.gridColumn26.MinWidth = 25;
			this.gridColumn26.Name = "gridColumn26";
			this.gridColumn26.Visible = true;
			this.gridColumn26.VisibleIndex = 14;
			this.gridColumn26.VisibleIndex = 12;
			this.gridColumn26.Width = 94;
			//
			// gridColumn2
			@@ -670,7 +666,7 @@
			this.gridColumn2.MinWidth = 25;
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 17;
			this.gridColumn2.VisibleIndex = 15;
			this.gridColumn2.Width = 94;
			//
			// pageBar1
			@@ -1480,7 +1476,7 @@
			this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
			this.ucBtnPrint1.Name = "ucBtnPrint1";
			this.ucBtnPrint1.rptParameter = null;
			this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
			this.ucBtnPrint1.Size = new System.Drawing.Size(352, 37);
			this.ucBtnPrint1.TabIndex = 230;
			//
			// radOut
			@@ -1493,7 +1489,8 @@
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
			new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
			this.radOut.Size = new System.Drawing.Size(227, 28);
			this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
			this.radOut.Size = new System.Drawing.Size(351, 37);
			this.radOut.StyleController = this.layout99;
			this.radOut.TabIndex = 476;
			//
			@@ -1709,13 +1706,10 @@
			//
			this.layoutControlItem30.Control = this.radOut;
			this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);
			this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
			this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
			this.layoutControlItem30.Name = "layoutControlItem30";
			this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
			this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);
			this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem30.Text = "自动计算";
			this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem30.TextVisible = false;
			@@ -1724,14 +1718,11 @@
			//
			this.layoutControlItem31.Control = this.ucBtnPrint1;
			this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);
			this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
			this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
			this.layoutControlItem31.Name = "layoutControlItem31";
			this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
			this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);
			this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
			this.layoutControlItem31.Text = "打印按钮";
			this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem31.TextVisible = false;