diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index a5b5231..5da75bf 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -30,6 +30,10 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); + DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); + DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule(); + DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.panel1 = new System.Windows.Forms.Panel(); this.DgcOrg = new DevExpress.XtraGrid.GridControl(); @@ -220,7 +224,7 @@ this.gridColumn158 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn159 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn160 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn162 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.splitter6 = new System.Windows.Forms.Splitter(); this.panel12 = new System.Windows.Forms.Panel(); @@ -370,6 +374,9 @@ this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -2965,10 +2972,18 @@ this.gridColumn158, this.gridColumn159, this.gridColumn160, - this.gridColumn162}); + this.gridColumn100, + this.gridColumn99}); this.DgvCheckCost2.FixedLineWidth = 1; + gridFormatRule1.Column = this.gridColumn99; + gridFormatRule1.Name = "Format0"; + formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; + formatConditionRuleExpression1.Appearance.Options.UseForeColor = true; + formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null"; + formatConditionRuleExpression1.PredefinedName = "Strikeout Text"; + gridFormatRule1.Rule = formatConditionRuleExpression1; + this.DgvCheckCost2.FormatRules.Add(gridFormatRule1); this.DgvCheckCost2.GridControl = this.DgcCheckCost2; - this.DgvCheckCost2.GroupCount = 1; this.DgvCheckCost2.GroupFormat = "{0}"; this.DgvCheckCost2.IndicatorWidth = 40; this.DgvCheckCost2.Name = "DgvCheckCost2"; @@ -2981,13 +2996,9 @@ this.DgvCheckCost2.OptionsView.ShowGroupPanel = false; this.DgvCheckCost2.OptionsView.ShowIndicator = false; this.DgvCheckCost2.RowHeight = 40; - this.DgvCheckCost2.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { - new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn162, DevExpress.Data.ColumnSortOrder.Ascending)}); // // gridColumn143 // - this.gridColumn143.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn143.AppearanceCell.Options.UseFont = true; this.gridColumn143.Caption = "订单号"; this.gridColumn143.FieldName = "ID"; this.gridColumn143.Name = "gridColumn143"; @@ -3005,8 +3016,6 @@ // // gridColumn144 // - this.gridColumn144.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn144.AppearanceCell.Options.UseFont = true; this.gridColumn144.Caption = "体检号"; this.gridColumn144.FieldName = "EID"; this.gridColumn144.Name = "gridColumn144"; @@ -3023,8 +3032,6 @@ // // gridColumn145 // - this.gridColumn145.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn145.AppearanceCell.Options.UseFont = true; this.gridColumn145.Caption = "姓名"; this.gridColumn145.FieldName = "Name"; this.gridColumn145.Name = "gridColumn145"; @@ -3041,8 +3048,6 @@ // // gridColumn146 // - this.gridColumn146.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn146.AppearanceCell.Options.UseFont = true; this.gridColumn146.Caption = "费用合计"; this.gridColumn146.DisplayFormat.FormatString = "c"; this.gridColumn146.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -3062,8 +3067,6 @@ // // gridColumn147 // - this.gridColumn147.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn147.AppearanceCell.Options.UseFont = true; this.gridColumn147.Caption = "折扣"; this.gridColumn147.FieldName = "Discount"; this.gridColumn147.Name = "gridColumn147"; @@ -3083,8 +3086,6 @@ // // gridColumn148 // - this.gridColumn148.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn148.AppearanceCell.Options.UseFont = true; this.gridColumn148.Caption = "实收费用"; this.gridColumn148.DisplayFormat.FormatString = "c"; this.gridColumn148.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -3108,8 +3109,6 @@ // // gridColumn149 // - this.gridColumn149.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn149.AppearanceCell.Options.UseFont = true; this.gridColumn149.Caption = "创建人"; this.gridColumn149.FieldName = "Creator"; this.gridColumn149.Name = "gridColumn149"; @@ -3127,8 +3126,6 @@ // // gridColumn150 // - this.gridColumn150.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn150.AppearanceCell.Options.UseFont = true; this.gridColumn150.Caption = "创建时间"; this.gridColumn150.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn150.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3148,8 +3145,6 @@ // // gridColumn151 // - this.gridColumn151.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn151.AppearanceCell.Options.UseFont = true; this.gridColumn151.Caption = "记账人"; this.gridColumn151.FieldName = "Charger"; this.gridColumn151.Name = "gridColumn151"; @@ -3166,8 +3161,6 @@ // // gridColumn152 // - this.gridColumn152.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn152.AppearanceCell.Options.UseFont = true; this.gridColumn152.Caption = "记账时间"; this.gridColumn152.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn152.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3187,8 +3180,6 @@ // // gridColumn157 // - this.gridColumn157.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn157.AppearanceCell.Options.UseFont = true; this.gridColumn157.Caption = "发送人"; this.gridColumn157.FieldName = "Sender"; this.gridColumn157.Name = "gridColumn157"; @@ -3205,8 +3196,6 @@ // // gridColumn158 // - this.gridColumn158.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn158.AppearanceCell.Options.UseFont = true; this.gridColumn158.Caption = "发送时间"; this.gridColumn158.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn158.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3226,8 +3215,6 @@ // // gridColumn159 // - this.gridColumn159.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn159.AppearanceCell.Options.UseFont = true; this.gridColumn159.Caption = "收费人"; this.gridColumn159.FieldName = "Coster"; this.gridColumn159.Name = "gridColumn159"; @@ -3244,8 +3231,6 @@ // // gridColumn160 // - this.gridColumn160.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn160.AppearanceCell.Options.UseFont = true; this.gridColumn160.Caption = "收费时间"; this.gridColumn160.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn160.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3263,21 +3248,23 @@ this.gridColumn160.VisibleIndex = 13; this.gridColumn160.Width = 130; // - // gridColumn162 - // - this.gridColumn162.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn162.AppearanceCell.Options.UseFont = true; - this.gridColumn162.Caption = "团体订单"; - this.gridColumn162.FieldName = "OEID"; - this.gridColumn162.Name = "gridColumn162"; - this.gridColumn162.OptionsColumn.AllowEdit = false; - this.gridColumn162.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn162.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn162.OptionsColumn.AllowMove = false; - this.gridColumn162.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn162.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn162.OptionsColumn.ReadOnly = true; - this.gridColumn162.OptionsFilter.AllowFilter = false; + // gridColumn99 + // + this.gridColumn99.Caption = "退费时间"; + this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn99.FieldName = "CancelTime"; + this.gridColumn99.Name = "gridColumn99"; + this.gridColumn99.OptionsColumn.AllowEdit = false; + this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMove = false; + this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.ReadOnly = true; + this.gridColumn99.OptionsFilter.AllowFilter = false; + this.gridColumn99.Visible = true; + this.gridColumn99.VisibleIndex = 15; // // repositoryItemMemoEdit2 // @@ -3433,8 +3420,19 @@ this.gridColumn153, this.gridColumn154, this.gridColumn155, - this.gridColumn156}); + this.gridColumn156, + this.gridColumn101, + this.gridColumn102}); this.DgvCheckCost.FixedLineWidth = 1; + gridFormatRule2.ApplyToRow = true; + gridFormatRule2.Column = this.gridColumn102; + gridFormatRule2.Name = "Format0"; + formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray; + formatConditionRuleExpression2.Appearance.Options.UseForeColor = true; + formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null"; + formatConditionRuleExpression2.PredefinedName = "Strikeout Text"; + gridFormatRule2.Rule = formatConditionRuleExpression2; + this.DgvCheckCost.FormatRules.Add(gridFormatRule2); this.DgvCheckCost.GridControl = this.DgcCheckCost; this.DgvCheckCost.GroupCount = 1; this.DgvCheckCost.GroupFormat = ""; @@ -3468,8 +3466,6 @@ // // gridColumn118 // - this.gridColumn118.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn118.AppearanceCell.Options.UseFont = true; this.gridColumn118.Caption = "订单号"; this.gridColumn118.FieldName = "ID"; this.gridColumn118.Name = "gridColumn118"; @@ -3487,8 +3483,6 @@ // // gridColumn123 // - this.gridColumn123.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn123.AppearanceCell.Options.UseFont = true; this.gridColumn123.Caption = "体检号"; this.gridColumn123.FieldName = "EID"; this.gridColumn123.Name = "gridColumn123"; @@ -3505,8 +3499,6 @@ // // gridColumn142 // - this.gridColumn142.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn142.AppearanceCell.Options.UseFont = true; this.gridColumn142.Caption = "姓名"; this.gridColumn142.FieldName = "Name"; this.gridColumn142.Name = "gridColumn142"; @@ -3523,8 +3515,6 @@ // // gridColumn119 // - this.gridColumn119.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn119.AppearanceCell.Options.UseFont = true; this.gridColumn119.Caption = "费用合计"; this.gridColumn119.DisplayFormat.FormatString = "c"; this.gridColumn119.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -3544,8 +3534,6 @@ // // gridColumn121 // - this.gridColumn121.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn121.AppearanceCell.Options.UseFont = true; this.gridColumn121.Caption = "折扣"; this.gridColumn121.FieldName = "Discount"; this.gridColumn121.Name = "gridColumn121"; @@ -3565,8 +3553,6 @@ // // gridColumn122 // - this.gridColumn122.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn122.AppearanceCell.Options.UseFont = true; this.gridColumn122.Caption = "实收费用"; this.gridColumn122.DisplayFormat.FormatString = "c"; this.gridColumn122.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -3590,8 +3576,6 @@ // // gridColumn124 // - this.gridColumn124.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn124.AppearanceCell.Options.UseFont = true; this.gridColumn124.Caption = "创建人"; this.gridColumn124.FieldName = "Creator"; this.gridColumn124.Name = "gridColumn124"; @@ -3609,8 +3593,6 @@ // // gridColumn141 // - this.gridColumn141.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn141.AppearanceCell.Options.UseFont = true; this.gridColumn141.Caption = "创建时间"; this.gridColumn141.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn141.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3630,8 +3612,6 @@ // // gridColumn120 // - this.gridColumn120.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn120.AppearanceCell.Options.UseFont = true; this.gridColumn120.Caption = "记账人"; this.gridColumn120.FieldName = "Charger"; this.gridColumn120.Name = "gridColumn120"; @@ -3648,8 +3628,6 @@ // // gridColumn125 // - this.gridColumn125.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn125.AppearanceCell.Options.UseFont = true; this.gridColumn125.Caption = "记账时间"; this.gridColumn125.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn125.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3669,8 +3647,6 @@ // // gridColumn153 // - this.gridColumn153.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn153.AppearanceCell.Options.UseFont = true; this.gridColumn153.Caption = "发送人"; this.gridColumn153.FieldName = "Sender"; this.gridColumn153.Name = "gridColumn153"; @@ -3687,8 +3663,6 @@ // // gridColumn154 // - this.gridColumn154.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn154.AppearanceCell.Options.UseFont = true; this.gridColumn154.Caption = "发送时间"; this.gridColumn154.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn154.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -3708,8 +3682,6 @@ // // gridColumn155 // - this.gridColumn155.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn155.AppearanceCell.Options.UseFont = true; this.gridColumn155.Caption = "收费人"; this.gridColumn155.FieldName = "Coster"; this.gridColumn155.Name = "gridColumn155"; @@ -3726,8 +3698,6 @@ // // gridColumn156 // - this.gridColumn156.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn156.AppearanceCell.Options.UseFont = true; this.gridColumn156.Caption = "收费时间"; this.gridColumn156.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn156.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -5164,6 +5134,56 @@ // this.gridView8.Name = "gridView8"; // + // gridColumn100 + // + this.gridColumn100.Caption = "退费人"; + this.gridColumn100.FieldName = "Cancer"; + this.gridColumn100.Name = "gridColumn100"; + this.gridColumn100.OptionsColumn.AllowEdit = false; + this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMove = false; + this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.ReadOnly = true; + this.gridColumn100.OptionsFilter.AllowFilter = false; + this.gridColumn100.Visible = true; + this.gridColumn100.VisibleIndex = 14; + // + // gridColumn101 + // + this.gridColumn101.Caption = "退费人"; + this.gridColumn101.FieldName = "Cancer"; + this.gridColumn101.Name = "gridColumn101"; + this.gridColumn101.OptionsColumn.AllowEdit = false; + this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMove = false; + this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.ReadOnly = true; + this.gridColumn101.OptionsFilter.AllowFilter = false; + this.gridColumn101.Visible = true; + this.gridColumn101.VisibleIndex = 14; + // + // gridColumn102 + // + this.gridColumn102.Caption = "退费时间"; + this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn102.FieldName = "CancelTime"; + this.gridColumn102.Name = "gridColumn102"; + this.gridColumn102.OptionsColumn.AllowEdit = false; + this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMove = false; + this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.ReadOnly = true; + this.gridColumn102.OptionsFilter.AllowFilter = false; + this.gridColumn102.Visible = true; + this.gridColumn102.VisibleIndex = 15; + // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); @@ -5590,7 +5610,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn158; private DevExpress.XtraGrid.Columns.GridColumn gridColumn159; private DevExpress.XtraGrid.Columns.GridColumn gridColumn160; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn162; private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2; private System.Windows.Forms.Splitter splitter6; private System.Windows.Forms.Panel panel12; @@ -5625,5 +5644,9 @@ private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem15; private System.Windows.Forms.ToolStripMenuItem FastRecall; private System.Windows.Forms.ToolStripMenuItem PFastRefreshCost; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn99; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn100; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn101; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn102; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 686ea42..21cf424 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -129,8 +129,6 @@ namespace PEIS.View.Enrollment DgvCheckCost.RowStyle += DgvCheckCost_RowStyle; DgvCheckCost.CustomDrawGroupRow += DgvCheckCost_CustomDrawGroupRow; DgvCheckCost2.RowStyle += DgvCheckCost2_RowStyle; - DgvCheckCost2.CustomDrawGroupRow += DgvCheckCost2_CustomDrawGroupRow; - // 打印个人收费单 @@ -953,11 +951,11 @@ namespace PEIS.View.Enrollment private void TsmiPrintGroup_Click(object sender, EventArgs e) // 打印分组收费单 { - if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null).ToList().Count == 0) return; + if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return; try { - var list = _lstCheckCost.Where(w => w.CostTime == null && w.GroupTag).ToList(); + var list = _lstCheckCost.Where(w => w.CostTime == null && w.GroupTag && w.CancelTime == null).ToList(); _pReport = ReportHelper.PrintTCheckCost(list, DgvOrg.GetRow(DgvOrg.GetSelectedRows()[0]) as EnrollmentOrg); _pReport.Show(); @@ -971,11 +969,11 @@ namespace PEIS.View.Enrollment private void TsmiPrintTeam_Click(object sender, EventArgs e) // 打印团体收费单 { - if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null).ToList().Count == 0) return; + if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return; try { - var list = _lstCheckCost.Where(w => w.CostTime == null).ToList(); + var list = _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList(); _pReport = ReportHelper.PrintTCheckCost(list, DgvOrg.GetRow(DgvOrg.GetSelectedRows()[0]) as EnrollmentOrg); _pReport.Show(); @@ -989,11 +987,11 @@ namespace PEIS.View.Enrollment private void TsmiPrintPerson_Click(object sender, EventArgs e) // 打印个人收费单 { - if (!_lstCheckCost2.Any() || _lstCheckCost2.Where(w => w.CostTime == null).ToList().Count == 0) return; + if (!_lstCheckCost2.Any() || _lstCheckCost2.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return; try { - var list = _lstCheckCost2.Where(w => w.CostTime == null && w.OEID == null).ToList(); + var list = _lstCheckCost2.Where(w => w.CostTime == null && w.OEID == null && w.CancelTime == null).ToList(); _pReport = ReportHelper.PrintCheckCost(list, DgvEnrollment.GetRow(DgvEnrollment.GetSelectedRows()[0]) as EnrollmentPatient); _pReport.Show(); @@ -1263,13 +1261,6 @@ namespace PEIS.View.Enrollment grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单"; } - private void DgvCheckCost2_CustomDrawGroupRow(object sender, DevExpress.XtraGrid.Views.Base.RowObjectCustomDrawEventArgs e) - { - GridGroupRowInfo grid = e.Info as GridGroupRowInfo; - var index = DgvCheckCost2.GetDataRowHandleByGroupRowHandle(e.RowHandle); - grid.GroupText = DgvCheckCost2.GetRowCellValue(index, "OEID") == null ? "个人订单" : "团体订单"; - } - private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) { if (DgvEnrollmentFeeItem.RowCount == 0) return; diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs index 8084285..5e7f3dd 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs @@ -32,6 +32,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm)); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn142 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -46,7 +47,6 @@ this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); this.RegListPanel = new System.Windows.Forms.Panel(); this.DgcRegItem = new DevExpress.XtraGrid.GridControl(); this.RegMenu = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -231,6 +231,7 @@ this.DgcCheckCost = new DevExpress.XtraGrid.GridControl(); this.DgvCheckCost = new DevExpress.XtraGrid.Views.Grid.GridView(); this.repositoryItemMemoEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); + this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn(); this.RegListPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).BeginInit(); this.RegMenu.SuspendLayout(); @@ -292,10 +293,26 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit3)).BeginInit(); this.SuspendLayout(); // + // gridColumn52 + // + this.gridColumn52.Caption = "退费时间"; + this.gridColumn52.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn52.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn52.FieldName = "CancelTime"; + this.gridColumn52.Name = "gridColumn52"; + this.gridColumn52.OptionsColumn.AllowEdit = false; + this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.AllowMove = false; + this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.ReadOnly = true; + this.gridColumn52.OptionsFilter.AllowFilter = false; + this.gridColumn52.Visible = true; + this.gridColumn52.VisibleIndex = 15; + // // gridColumn118 // - this.gridColumn118.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn118.AppearanceCell.Options.UseFont = true; this.gridColumn118.Caption = "订单号"; this.gridColumn118.FieldName = "ID"; this.gridColumn118.Name = "gridColumn118"; @@ -313,8 +330,6 @@ // // gridColumn123 // - this.gridColumn123.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn123.AppearanceCell.Options.UseFont = true; this.gridColumn123.Caption = "体检号"; this.gridColumn123.FieldName = "EID"; this.gridColumn123.Name = "gridColumn123"; @@ -331,8 +346,6 @@ // // gridColumn142 // - this.gridColumn142.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn142.AppearanceCell.Options.UseFont = true; this.gridColumn142.Caption = "姓名"; this.gridColumn142.FieldName = "Name"; this.gridColumn142.Name = "gridColumn142"; @@ -349,8 +362,6 @@ // // gridColumn119 // - this.gridColumn119.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn119.AppearanceCell.Options.UseFont = true; this.gridColumn119.Caption = "费用合计"; this.gridColumn119.DisplayFormat.FormatString = "c"; this.gridColumn119.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -370,8 +381,6 @@ // // gridColumn121 // - this.gridColumn121.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn121.AppearanceCell.Options.UseFont = true; this.gridColumn121.Caption = "折扣"; this.gridColumn121.FieldName = "Discount"; this.gridColumn121.Name = "gridColumn121"; @@ -391,8 +400,6 @@ // // gridColumn122 // - this.gridColumn122.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn122.AppearanceCell.Options.UseFont = true; this.gridColumn122.Caption = "实收费用"; this.gridColumn122.DisplayFormat.FormatString = "c"; this.gridColumn122.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; @@ -416,8 +423,6 @@ // // gridColumn124 // - this.gridColumn124.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn124.AppearanceCell.Options.UseFont = true; this.gridColumn124.Caption = "创建人"; this.gridColumn124.FieldName = "Creator"; this.gridColumn124.Name = "gridColumn124"; @@ -435,8 +440,6 @@ // // gridColumn141 // - this.gridColumn141.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn141.AppearanceCell.Options.UseFont = true; this.gridColumn141.Caption = "创建时间"; this.gridColumn141.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn141.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -456,8 +459,6 @@ // // gridColumn33 // - this.gridColumn33.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn33.AppearanceCell.Options.UseFont = true; this.gridColumn33.Caption = "记账人"; this.gridColumn33.FieldName = "Charger"; this.gridColumn33.Name = "gridColumn33"; @@ -474,8 +475,6 @@ // // gridColumn34 // - this.gridColumn34.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn34.AppearanceCell.Options.UseFont = true; this.gridColumn34.Caption = "记账时间"; this.gridColumn34.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn34.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -495,8 +494,6 @@ // // gridColumn35 // - this.gridColumn35.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn35.AppearanceCell.Options.UseFont = true; this.gridColumn35.Caption = "发送人"; this.gridColumn35.FieldName = "Sender"; this.gridColumn35.Name = "gridColumn35"; @@ -513,8 +510,6 @@ // // gridColumn36 // - this.gridColumn36.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn36.AppearanceCell.Options.UseFont = true; this.gridColumn36.Caption = "发送时间"; this.gridColumn36.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn36.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -534,8 +529,6 @@ // // gridColumn37 // - this.gridColumn37.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn37.AppearanceCell.Options.UseFont = true; this.gridColumn37.Caption = "收费人"; this.gridColumn37.FieldName = "Coster"; this.gridColumn37.Name = "gridColumn37"; @@ -552,8 +545,6 @@ // // gridColumn38 // - this.gridColumn38.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn38.AppearanceCell.Options.UseFont = true; this.gridColumn38.Caption = "收费时间"; this.gridColumn38.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; this.gridColumn38.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; @@ -571,22 +562,6 @@ this.gridColumn38.VisibleIndex = 13; this.gridColumn38.Width = 130; // - // gridColumn52 - // - this.gridColumn52.Caption = "退费时间"; - this.gridColumn52.FieldName = "CancelTime"; - this.gridColumn52.Name = "gridColumn52"; - this.gridColumn52.OptionsColumn.AllowEdit = false; - this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.AllowMove = false; - this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.ReadOnly = true; - this.gridColumn52.OptionsFilter.AllowFilter = false; - this.gridColumn52.Visible = true; - this.gridColumn52.VisibleIndex = 14; - // // RegListPanel // this.RegListPanel.BackColor = System.Drawing.Color.White; @@ -2736,11 +2711,11 @@ this.gridColumn36, this.gridColumn37, this.gridColumn38, + this.gridColumn53, this.gridColumn52}); this.DgvCheckCost.FixedLineWidth = 1; gridFormatRule1.ApplyToRow = true; gridFormatRule1.Column = this.gridColumn52; - gridFormatRule1.ColumnApplyTo = this.gridColumn123; gridFormatRule1.Name = "Format0"; formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; formatConditionRuleExpression1.Appearance.Options.UseForeColor = true; @@ -2768,6 +2743,22 @@ this.repositoryItemMemoEdit3.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.repositoryItemMemoEdit3.Name = "repositoryItemMemoEdit3"; // + // gridColumn53 + // + this.gridColumn53.Caption = "退费人"; + this.gridColumn53.FieldName = "Cancer"; + this.gridColumn53.Name = "gridColumn53"; + this.gridColumn53.OptionsColumn.AllowEdit = false; + this.gridColumn53.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn53.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn53.OptionsColumn.AllowMove = false; + this.gridColumn53.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn53.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn53.OptionsColumn.ReadOnly = true; + this.gridColumn53.OptionsFilter.AllowFilter = false; + this.gridColumn53.Visible = true; + this.gridColumn53.VisibleIndex = 14; + // // EnrollmentPersonForm // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); @@ -3056,5 +3047,6 @@ private System.Windows.Forms.ToolStripMenuItem FastRecallDept; private System.Windows.Forms.ToolStripMenuItem FastRefreshCost; private DevExpress.XtraGrid.Columns.GridColumn gridColumn52; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn53; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index df3d5ca..cc0983b 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -548,7 +548,7 @@ namespace PEIS.View.Enrollment try { - var list = _lstCheckCost.Where(w => w.CostTime == null).ToList(); + var list = _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList(); pReport = ReportHelper.PrintCheckCost(list, _chooseRegItem); pReport.Show(); diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index f33a04a..2c3e967 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -345,8 +345,9 @@ // splitContainerBase.Panel2 // this.splitContainerBase.Panel2.Controls.Add(this.panelRightBase); - this.splitContainerBase.Size = new System.Drawing.Size(1444, 825); + this.splitContainerBase.Size = new System.Drawing.Size(2888, 1504); this.splitContainerBase.SplitterDistance = 235; + this.splitContainerBase.SplitterWidth = 8; this.splitContainerBase.TabIndex = 0; // // panelLeftBase @@ -358,19 +359,20 @@ this.panelLeftBase.Location = new System.Drawing.Point(0, 0); this.panelLeftBase.Margin = new System.Windows.Forms.Padding(0); this.panelLeftBase.Name = "panelLeftBase"; - this.panelLeftBase.Size = new System.Drawing.Size(235, 825); + this.panelLeftBase.Size = new System.Drawing.Size(235, 1504); this.panelLeftBase.TabIndex = 0; // // DgcPatient // this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPatient.Location = new System.Drawing.Point(0, 250); + this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.DgcPatient.Location = new System.Drawing.Point(0, 456); this.DgcPatient.MainView = this.DgvPatient; this.DgcPatient.Margin = new System.Windows.Forms.Padding(0); this.DgcPatient.Name = "DgcPatient"; this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcPatient.Size = new System.Drawing.Size(235, 575); + this.DgcPatient.Size = new System.Drawing.Size(235, 1048); this.DgcPatient.TabIndex = 127; this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPatient}); @@ -619,17 +621,17 @@ this.panelQuery.Location = new System.Drawing.Point(0, 0); this.panelQuery.Margin = new System.Windows.Forms.Padding(0); this.panelQuery.Name = "panelQuery"; - this.panelQuery.Size = new System.Drawing.Size(235, 250); + this.panelQuery.Size = new System.Drawing.Size(235, 456); this.panelQuery.TabIndex = 126; // // panel1 // this.panel1.Controls.Add(this.menuStrip1); this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel1.Location = new System.Drawing.Point(0, 210); + this.panel1.Location = new System.Drawing.Point(0, 383); this.panel1.Margin = new System.Windows.Forms.Padding(0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(235, 40); + this.panel1.Size = new System.Drawing.Size(235, 73); this.panel1.TabIndex = 156; // // menuStrip1 @@ -645,9 +647,9 @@ this.toolStripTextBox1}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 0, 10, 0); this.menuStrip1.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.menuStrip1.Size = new System.Drawing.Size(235, 40); + this.menuStrip1.Size = new System.Drawing.Size(235, 73); this.menuStrip1.TabIndex = 59; this.menuStrip1.Text = "menuStrip2"; // @@ -656,7 +658,7 @@ this.BtnRefresh.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.BtnRefresh.Image = global::PEIS.Properties.Resources.刷新; this.BtnRefresh.Name = "BtnRefresh"; - this.BtnRefresh.Size = new System.Drawing.Size(73, 40); + this.BtnRefresh.Size = new System.Drawing.Size(107, 73); this.BtnRefresh.Text = "刷新"; // // toolStripTextBox1 @@ -665,16 +667,17 @@ this.toolStripTextBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.ReadOnly = true; - this.toolStripTextBox1.Size = new System.Drawing.Size(180, 40); + this.toolStripTextBox1.Size = new System.Drawing.Size(356, 73); this.toolStripTextBox1.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolStripTextBox1.Visible = false; // // RbStatus4 // this.RbStatus4.AutoSize = true; - this.RbStatus4.Location = new System.Drawing.Point(168, 128); + this.RbStatus4.Location = new System.Drawing.Point(336, 233); + this.RbStatus4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.RbStatus4.Name = "RbStatus4"; - this.RbStatus4.Size = new System.Drawing.Size(50, 21); + this.RbStatus4.Size = new System.Drawing.Size(93, 35); this.RbStatus4.TabIndex = 155; this.RbStatus4.TabStop = true; this.RbStatus4.Text = "全部"; @@ -684,9 +687,10 @@ // this.RbStatus3.AutoSize = true; this.RbStatus3.BackColor = System.Drawing.Color.Transparent; - this.RbStatus3.Location = new System.Drawing.Point(73, 128); + this.RbStatus3.Location = new System.Drawing.Point(146, 233); + this.RbStatus3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.RbStatus3.Name = "RbStatus3"; - this.RbStatus3.Size = new System.Drawing.Size(74, 21); + this.RbStatus3.Size = new System.Drawing.Size(141, 35); this.RbStatus3.TabIndex = 154; this.RbStatus3.TabStop = true; this.RbStatus3.Text = "科室分检"; @@ -695,9 +699,10 @@ // txtInfo // this.txtInfo.ForeColor = System.Drawing.Color.Gray; - this.txtInfo.Location = new System.Drawing.Point(73, 182); + this.txtInfo.Location = new System.Drawing.Point(146, 332); + this.txtInfo.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.txtInfo.Name = "txtInfo"; - this.txtInfo.Size = new System.Drawing.Size(160, 23); + this.txtInfo.Size = new System.Drawing.Size(316, 39); this.txtInfo.TabIndex = 10; this.txtInfo.WatermarkColor = System.Drawing.Color.Gray; this.txtInfo.WatermarkText = null; @@ -705,29 +710,30 @@ // txtTeam // this.txtTeam.ForeColor = System.Drawing.Color.Gray; - this.txtTeam.Location = new System.Drawing.Point(73, 155); + this.txtTeam.Location = new System.Drawing.Point(146, 283); + this.txtTeam.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.txtTeam.Name = "txtTeam"; - this.txtTeam.Size = new System.Drawing.Size(160, 23); + this.txtTeam.Size = new System.Drawing.Size(316, 39); this.txtTeam.TabIndex = 9; this.txtTeam.WatermarkColor = System.Drawing.Color.Gray; this.txtTeam.WatermarkText = null; // // lbl7 // - this.lbl7.Location = new System.Drawing.Point(3, 182); + this.lbl7.Location = new System.Drawing.Point(6, 332); this.lbl7.Margin = new System.Windows.Forms.Padding(0); this.lbl7.Name = "lbl7"; - this.lbl7.Size = new System.Drawing.Size(70, 30); + this.lbl7.Size = new System.Drawing.Size(140, 55); this.lbl7.TabIndex = 153; this.lbl7.Text = "体检者："; this.lbl7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lbl6 // - this.lbl6.Location = new System.Drawing.Point(3, 150); + this.lbl6.Location = new System.Drawing.Point(6, 274); this.lbl6.Margin = new System.Windows.Forms.Padding(0); this.lbl6.Name = "lbl6"; - this.lbl6.Size = new System.Drawing.Size(70, 30); + this.lbl6.Size = new System.Drawing.Size(140, 55); this.lbl6.TabIndex = 151; this.lbl6.Text = "体检团队："; this.lbl6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -740,18 +746,18 @@ this.comboDate.FormattingEnabled = true; this.comboDate.Items.AddRange(new object[] { "一般检查"}); - this.comboDate.Location = new System.Drawing.Point(73, 10); - this.comboDate.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0); + this.comboDate.Location = new System.Drawing.Point(146, 18); + this.comboDate.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.comboDate.Name = "comboDate"; - this.comboDate.Size = new System.Drawing.Size(160, 25); + this.comboDate.Size = new System.Drawing.Size(316, 39); this.comboDate.TabIndex = 2; // // lbl3 // - this.lbl3.Location = new System.Drawing.Point(3, 37); + this.lbl3.Location = new System.Drawing.Point(6, 67); this.lbl3.Margin = new System.Windows.Forms.Padding(0); this.lbl3.Name = "lbl3"; - this.lbl3.Size = new System.Drawing.Size(70, 30); + this.lbl3.Size = new System.Drawing.Size(140, 55); this.lbl3.TabIndex = 149; this.lbl3.Text = "开始日期："; this.lbl3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -759,9 +765,10 @@ // RbStatus2 // this.RbStatus2.AutoSize = true; - this.RbStatus2.Location = new System.Drawing.Point(168, 101); + this.RbStatus2.Location = new System.Drawing.Point(336, 184); + this.RbStatus2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.RbStatus2.Name = "RbStatus2"; - this.RbStatus2.Size = new System.Drawing.Size(50, 21); + this.RbStatus2.Size = new System.Drawing.Size(93, 35); this.RbStatus2.TabIndex = 7; this.RbStatus2.TabStop = true; this.RbStatus2.Text = "打印"; @@ -771,9 +778,10 @@ // this.RbStatus1.AutoSize = true; this.RbStatus1.BackColor = System.Drawing.Color.Transparent; - this.RbStatus1.Location = new System.Drawing.Point(73, 101); + this.RbStatus1.Location = new System.Drawing.Point(146, 184); + this.RbStatus1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.RbStatus1.Name = "RbStatus1"; - this.RbStatus1.Size = new System.Drawing.Size(50, 21); + this.RbStatus1.Size = new System.Drawing.Size(93, 35); this.RbStatus1.TabIndex = 5; this.RbStatus1.TabStop = true; this.RbStatus1.Text = "总检"; @@ -781,30 +789,30 @@ // // lbl5 // - this.lbl5.Location = new System.Drawing.Point(3, 97); + this.lbl5.Location = new System.Drawing.Point(6, 177); this.lbl5.Margin = new System.Windows.Forms.Padding(0); this.lbl5.Name = "lbl5"; - this.lbl5.Size = new System.Drawing.Size(70, 30); + this.lbl5.Size = new System.Drawing.Size(140, 55); this.lbl5.TabIndex = 146; this.lbl5.Text = "体检状态："; this.lbl5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label2 // - this.label2.Location = new System.Drawing.Point(3, 67); + this.label2.Location = new System.Drawing.Point(6, 122); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(70, 30); + this.label2.Size = new System.Drawing.Size(140, 55); this.label2.TabIndex = 139; this.label2.Text = "结束日期："; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // lbl2 // - this.lbl2.Location = new System.Drawing.Point(3, 7); + this.lbl2.Location = new System.Drawing.Point(6, 13); this.lbl2.Margin = new System.Windows.Forms.Padding(0); this.lbl2.Name = "lbl2"; - this.lbl2.Size = new System.Drawing.Size(70, 30); + this.lbl2.Size = new System.Drawing.Size(140, 55); this.lbl2.TabIndex = 141; this.lbl2.Text = "日期类型："; this.lbl2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -814,10 +822,10 @@ this.dateEditEnd.CustomFormat = " yyyy 年 MM 月 dd 日"; this.dateEditEnd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dateEditEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateEditEnd.Location = new System.Drawing.Point(73, 70); + this.dateEditEnd.Location = new System.Drawing.Point(146, 128); this.dateEditEnd.Margin = new System.Windows.Forms.Padding(0); this.dateEditEnd.Name = "dateEditEnd"; - this.dateEditEnd.Size = new System.Drawing.Size(160, 23); + this.dateEditEnd.Size = new System.Drawing.Size(316, 39); this.dateEditEnd.TabIndex = 4; // // dateEditBeg @@ -825,10 +833,10 @@ this.dateEditBeg.CustomFormat = " yyyy 年 MM 月 dd 日"; this.dateEditBeg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dateEditBeg.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dateEditBeg.Location = new System.Drawing.Point(73, 40); + this.dateEditBeg.Location = new System.Drawing.Point(146, 73); this.dateEditBeg.Margin = new System.Windows.Forms.Padding(0); this.dateEditBeg.Name = "dateEditBeg"; - this.dateEditBeg.Size = new System.Drawing.Size(160, 23); + this.dateEditBeg.Size = new System.Drawing.Size(316, 39); this.dateEditBeg.TabIndex = 3; // // panelRightBase @@ -838,8 +846,9 @@ this.panelRightBase.Controls.Add(this.panelMenu); this.panelRightBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelRightBase.Location = new System.Drawing.Point(0, 0); + this.panelRightBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelRightBase.Name = "panelRightBase"; - this.panelRightBase.Size = new System.Drawing.Size(1205, 825); + this.panelRightBase.Size = new System.Drawing.Size(2645, 1504); this.panelRightBase.TabIndex = 2; // // panelExamInfoBase @@ -847,9 +856,10 @@ this.panelExamInfoBase.BackColor = System.Drawing.Color.White; this.panelExamInfoBase.Controls.Add(this.splitContainerExamInfo); this.panelExamInfoBase.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelExamInfoBase.Location = new System.Drawing.Point(0, 181); + this.panelExamInfoBase.Location = new System.Drawing.Point(0, 330); + this.panelExamInfoBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelExamInfoBase.Name = "panelExamInfoBase"; - this.panelExamInfoBase.Size = new System.Drawing.Size(1205, 644); + this.panelExamInfoBase.Size = new System.Drawing.Size(2645, 1174); this.panelExamInfoBase.TabIndex = 60; // // splitContainerExamInfo @@ -858,6 +868,7 @@ this.splitContainerExamInfo.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainerExamInfo.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainerExamInfo.Location = new System.Drawing.Point(0, 0); + this.splitContainerExamInfo.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.splitContainerExamInfo.Name = "splitContainerExamInfo"; // // splitContainerExamInfo.Panel1 @@ -867,8 +878,9 @@ // splitContainerExamInfo.Panel2 // this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL); - this.splitContainerExamInfo.Size = new System.Drawing.Size(1205, 644); - this.splitContainerExamInfo.SplitterDistance = 311; + this.splitContainerExamInfo.Size = new System.Drawing.Size(2645, 1174); + this.splitContainerExamInfo.SplitterDistance = 1747; + this.splitContainerExamInfo.SplitterWidth = 8; this.splitContainerExamInfo.TabIndex = 0; // // panelTxtSummary @@ -877,8 +889,9 @@ this.panelTxtSummary.Controls.Add(this.splitExamPart); this.panelTxtSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.panelTxtSummary.Location = new System.Drawing.Point(0, 0); + this.panelTxtSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelTxtSummary.Name = "panelTxtSummary"; - this.panelTxtSummary.Size = new System.Drawing.Size(311, 644); + this.panelTxtSummary.Size = new System.Drawing.Size(1747, 1174); this.panelTxtSummary.TabIndex = 2; // // splitExamPart @@ -886,6 +899,7 @@ this.splitExamPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitExamPart.Dock = System.Windows.Forms.DockStyle.Fill; this.splitExamPart.Location = new System.Drawing.Point(0, 0); + this.splitExamPart.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.splitExamPart.Name = "splitExamPart"; // // splitExamPart.Panel1 @@ -895,8 +909,9 @@ // splitExamPart.Panel2 // this.splitExamPart.Panel2.Controls.Add(this.txtSummary); - this.splitExamPart.Size = new System.Drawing.Size(311, 644); - this.splitExamPart.SplitterDistance = 143; + this.splitExamPart.Size = new System.Drawing.Size(1747, 1174); + this.splitExamPart.SplitterDistance = 803; + this.splitExamPart.SplitterWidth = 8; this.splitExamPart.TabIndex = 0; // // panel5 @@ -906,8 +921,9 @@ this.panel5.Controls.Add(this.DgcExamResultData); this.panel5.Dock = System.Windows.Forms.DockStyle.Fill; this.panel5.Location = new System.Drawing.Point(0, 0); + this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(143, 644); + this.panel5.Size = new System.Drawing.Size(803, 1174); this.panel5.TabIndex = 0; // // DgcExamResultData @@ -915,12 +931,14 @@ this.DgcExamResultData.Dock = System.Windows.Forms.DockStyle.Left; this.DgcExamResultData.EmbeddedNavigator.Appearance.Options.UseTextOptions = true; this.DgcExamResultData.EmbeddedNavigator.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.DgcExamResultData.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamResultData.Location = new System.Drawing.Point(0, 0); this.DgcExamResultData.MainView = this.DgvExamResultData; + this.DgcExamResultData.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamResultData.Name = "DgcExamResultData"; this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit4}); - this.DgcExamResultData.Size = new System.Drawing.Size(600, 627); + this.DgcExamResultData.Size = new System.Drawing.Size(1200, 1140); this.DgcExamResultData.TabIndex = 0; this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResultData}); @@ -1008,7 +1026,7 @@ this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn15.OptionsFilter.AllowFilter = false; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 1; + this.gridColumn15.VisibleIndex = 0; this.gridColumn15.Width = 198; // // gridColumn18 @@ -1041,7 +1059,7 @@ this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn19.OptionsFilter.AllowFilter = false; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 3; + this.gridColumn19.VisibleIndex = 2; this.gridColumn19.Width = 62; // // gridColumn31 @@ -1055,7 +1073,7 @@ this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn31.OptionsFilter.AllowFilter = false; this.gridColumn31.Visible = true; - this.gridColumn31.VisibleIndex = 4; + this.gridColumn31.VisibleIndex = 3; this.gridColumn31.Width = 107; // // gridColumn32 @@ -1069,7 +1087,7 @@ this.gridColumn32.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn32.OptionsFilter.AllowFilter = false; this.gridColumn32.Visible = true; - this.gridColumn32.VisibleIndex = 5; + this.gridColumn32.VisibleIndex = 4; this.gridColumn32.Width = 111; // // txtSummary @@ -1078,11 +1096,12 @@ this.txtSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.txtSummary.Font = new System.Drawing.Font("微软雅黑", 9F); this.txtSummary.Location = new System.Drawing.Point(0, 0); + this.txtSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.txtSummary.Multiline = true; this.txtSummary.Name = "txtSummary"; this.txtSummary.ReadOnly = true; this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtSummary.Size = new System.Drawing.Size(164, 644); + this.txtSummary.Size = new System.Drawing.Size(936, 1174); this.txtSummary.TabIndex = 4; this.txtSummary.Text = "科室小结"; // @@ -1091,8 +1110,9 @@ this.panelExamInfoL.Controls.Add(this.TabPart); this.panelExamInfoL.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExamInfoL.Location = new System.Drawing.Point(0, 0); + this.panelExamInfoL.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelExamInfoL.Name = "panelExamInfoL"; - this.panelExamInfoL.Size = new System.Drawing.Size(890, 644); + this.panelExamInfoL.Size = new System.Drawing.Size(890, 1174); this.panelExamInfoL.TabIndex = 2; // // TabPart @@ -1117,10 +1137,11 @@ this.TabPart.AppearancePage.PageClient.Options.UseFont = true; this.TabPart.Dock = System.Windows.Forms.DockStyle.Fill; this.TabPart.Location = new System.Drawing.Point(0, 0); + this.TabPart.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.TabPart.Name = "TabPart"; this.TabPart.SelectedTabPage = this.tabPageConslusion; this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True; - this.TabPart.Size = new System.Drawing.Size(890, 644); + this.TabPart.Size = new System.Drawing.Size(890, 1174); this.TabPart.TabIndex = 0; this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPageConslusion, @@ -1137,8 +1158,9 @@ this.tabPageConslusion.Controls.Add(this.panelAllConclusion); this.tabPageConslusion.Controls.Add(this.panelConclussionMenu); this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu; + this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageConslusion.Name = "tabPageConslusion"; - this.tabPageConslusion.Size = new System.Drawing.Size(884, 605); + this.tabPageConslusion.Size = new System.Drawing.Size(878, 1115); this.tabPageConslusion.Text = "结论词"; // // panelConclussion @@ -1146,23 +1168,26 @@ this.panelConclussion.BackColor = System.Drawing.Color.White; this.panelConclussion.Controls.Add(this.DgcExamConclusion); this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelConclussion.Location = new System.Drawing.Point(0, 40); + this.panelConclussion.Location = new System.Drawing.Point(0, 73); + this.panelConclussion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelConclussion.Name = "panelConclussion"; - this.panelConclussion.Size = new System.Drawing.Size(543, 565); + this.panelConclussion.Size = new System.Drawing.Size(196, 1042); this.panelConclussion.TabIndex = 3; // // DgcExamConclusion // this.DgcExamConclusion.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcExamConclusion.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamConclusion.Font = new System.Drawing.Font("微软雅黑", 9F); this.DgcExamConclusion.Location = new System.Drawing.Point(0, 0); this.DgcExamConclusion.MainView = this.DgvExamConclusion; + this.DgcExamConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamConclusion.Name = "DgcExamConclusion"; this.DgcExamConclusion.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemRichTextEdit2, this.repositoryItemMemoEdit2, this.CmbSearchConclusion}); - this.DgcExamConclusion.Size = new System.Drawing.Size(543, 565); + this.DgcExamConclusion.Size = new System.Drawing.Size(196, 1042); this.DgcExamConclusion.TabIndex = 5; this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamConclusion, @@ -1315,19 +1340,22 @@ this.panelAllConclusion.Controls.Add(this.DgcAllConclusion); this.panelAllConclusion.Controls.Add(this.panel2); this.panelAllConclusion.Dock = System.Windows.Forms.DockStyle.Right; - this.panelAllConclusion.Location = new System.Drawing.Point(543, 40); + this.panelAllConclusion.Location = new System.Drawing.Point(196, 73); + this.panelAllConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelAllConclusion.Name = "panelAllConclusion"; - this.panelAllConclusion.Size = new System.Drawing.Size(341, 565); + this.panelAllConclusion.Size = new System.Drawing.Size(682, 1042); this.panelAllConclusion.TabIndex = 2; // // DgcAllConclusion // this.DgcAllConclusion.Dock = System.Windows.Forms.DockStyle.Left; + this.DgcAllConclusion.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcAllConclusion.Font = new System.Drawing.Font("微软雅黑", 9F); - this.DgcAllConclusion.Location = new System.Drawing.Point(0, 36); + this.DgcAllConclusion.Location = new System.Drawing.Point(0, 66); this.DgcAllConclusion.MainView = this.DgvAllConclusion; + this.DgcAllConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcAllConclusion.Name = "DgcAllConclusion"; - this.DgcAllConclusion.Size = new System.Drawing.Size(500, 512); + this.DgcAllConclusion.Size = new System.Drawing.Size(1000, 942); this.DgcAllConclusion.TabIndex = 2; this.DgcAllConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvAllConclusion}); @@ -1407,26 +1435,27 @@ this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Margin = new System.Windows.Forms.Padding(0); this.panel2.Name = "panel2"; - this.panel2.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0); - this.panel2.Size = new System.Drawing.Size(500, 36); + this.panel2.Padding = new System.Windows.Forms.Padding(0, 7, 0, 0); + this.panel2.Size = new System.Drawing.Size(1000, 66); this.panel2.TabIndex = 1; // // txtConclusionSerch // this.txtConclusionSerch.Dock = System.Windows.Forms.DockStyle.Left; this.txtConclusionSerch.Font = new System.Drawing.Font("微软雅黑", 12F); - this.txtConclusionSerch.Location = new System.Drawing.Point(43, 4); + this.txtConclusionSerch.Location = new System.Drawing.Point(86, 7); this.txtConclusionSerch.Margin = new System.Windows.Forms.Padding(0); this.txtConclusionSerch.Name = "txtConclusionSerch"; - this.txtConclusionSerch.Size = new System.Drawing.Size(291, 29); + this.txtConclusionSerch.Size = new System.Drawing.Size(578, 50); this.txtConclusionSerch.TabIndex = 2; // // label4 // this.label4.Dock = System.Windows.Forms.DockStyle.Left; - this.label4.Location = new System.Drawing.Point(0, 4); + this.label4.Location = new System.Drawing.Point(0, 7); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(43, 32); + this.label4.Size = new System.Drawing.Size(86, 59); this.label4.TabIndex = 1; this.label4.Text = "搜索："; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -1436,17 +1465,18 @@ this.panelConclussionMenu.Controls.Add(this.OpsConclusion); this.panelConclussionMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelConclussionMenu.Location = new System.Drawing.Point(0, 0); + this.panelConclussionMenu.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelConclussionMenu.Name = "panelConclussionMenu"; - this.panelConclussionMenu.Size = new System.Drawing.Size(884, 40); + this.panelConclussionMenu.Size = new System.Drawing.Size(878, 73); this.panelConclussionMenu.TabIndex = 0; // // OpsConclusion // this.OpsConclusion.Dock = System.Windows.Forms.DockStyle.Fill; this.OpsConclusion.Location = new System.Drawing.Point(0, 0); - this.OpsConclusion.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7); + this.OpsConclusion.Margin = new System.Windows.Forms.Padding(6, 13, 6, 13); this.OpsConclusion.Name = "OpsConclusion"; - this.OpsConclusion.Size = new System.Drawing.Size(884, 40); + this.OpsConclusion.Size = new System.Drawing.Size(878, 73); this.OpsConclusion.TabIndex = 5; // // tabPageExam @@ -1467,19 +1497,22 @@ this.tabPageExam.Appearance.PageClient.Options.UseForeColor = true; this.tabPageExam.Controls.Add(this.DgcExamResult); this.tabPageExam.Image = global::PEIS.Properties.Resources.menu; + this.tabPageExam.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageExam.Name = "tabPageExam"; - this.tabPageExam.Size = new System.Drawing.Size(884, 605); + this.tabPageExam.Size = new System.Drawing.Size(1768, 1115); this.tabPageExam.Text = "一般项目"; // // DgcExamResult // this.DgcExamResult.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcExamResult.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamResult.Location = new System.Drawing.Point(0, 0); this.DgcExamResult.MainView = this.DgvExamResult; + this.DgcExamResult.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcExamResult.Name = "DgcExamResult"; this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcExamResult.Size = new System.Drawing.Size(884, 605); + this.DgcExamResult.Size = new System.Drawing.Size(1768, 1115); this.DgcExamResult.TabIndex = 140; this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResult}); @@ -1665,8 +1698,9 @@ // this.tabPageSummary.Controls.Add(this.panelDeptSummary); this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu; + this.tabPageSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageSummary.Name = "tabPageSummary"; - this.tabPageSummary.Size = new System.Drawing.Size(884, 605); + this.tabPageSummary.Size = new System.Drawing.Size(1768, 1115); this.tabPageSummary.Text = "科室小结"; // // panelDeptSummary @@ -1675,21 +1709,24 @@ this.panelDeptSummary.Controls.Add(this.DgcSummary); this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.panelDeptSummary.Location = new System.Drawing.Point(0, 0); + this.panelDeptSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelDeptSummary.Name = "panelDeptSummary"; - this.panelDeptSummary.Size = new System.Drawing.Size(884, 605); + this.panelDeptSummary.Size = new System.Drawing.Size(1768, 1115); this.panelDeptSummary.TabIndex = 61; // // DgcSummary // this.DgcSummary.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcSummary.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcSummary.Location = new System.Drawing.Point(0, 0); this.DgcSummary.MainView = this.DgvSummary; + this.DgcSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcSummary.Name = "DgcSummary"; this.DgcSummary.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemRichTextEdit1, this.repositoryItemTextEdit1, this.repositoryItemMemoEdit1}); - this.DgcSummary.Size = new System.Drawing.Size(884, 605); + this.DgcSummary.Size = new System.Drawing.Size(1768, 1115); this.DgcSummary.TabIndex = 0; this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvSummary}); @@ -1751,17 +1788,20 @@ // this.tabPageLis.Controls.Add(this.DgcLisReport); this.tabPageLis.Image = global::PEIS.Properties.Resources.menu; + this.tabPageLis.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageLis.Name = "tabPageLis"; - this.tabPageLis.Size = new System.Drawing.Size(884, 605); + this.tabPageLis.Size = new System.Drawing.Size(1768, 1115); this.tabPageLis.Text = "检验报告"; // // DgcLisReport // this.DgcLisReport.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcLisReport.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcLisReport.Location = new System.Drawing.Point(0, 0); this.DgcLisReport.MainView = this.DgvLisReport; + this.DgcLisReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcLisReport.Name = "DgcLisReport"; - this.DgcLisReport.Size = new System.Drawing.Size(884, 605); + this.DgcLisReport.Size = new System.Drawing.Size(1768, 1115); this.DgcLisReport.TabIndex = 1; this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvLisReport}); @@ -1870,8 +1910,9 @@ // this.tabPagePacs.Controls.Add(this.panelPacsBase); this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu; + this.tabPagePacs.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPagePacs.Name = "tabPagePacs"; - this.tabPagePacs.Size = new System.Drawing.Size(884, 605); + this.tabPagePacs.Size = new System.Drawing.Size(1768, 1115); this.tabPagePacs.Text = "检查报告"; // // panelPacsBase @@ -1880,8 +1921,9 @@ this.panelPacsBase.Controls.Add(this.panelPacsRptList); this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsBase.Location = new System.Drawing.Point(0, 0); + this.panelPacsBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelPacsBase.Name = "panelPacsBase"; - this.panelPacsBase.Size = new System.Drawing.Size(884, 605); + this.panelPacsBase.Size = new System.Drawing.Size(1768, 1115); this.panelPacsBase.TabIndex = 1; // // xtraTabControl1 @@ -1889,10 +1931,11 @@ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.xtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Left; this.xtraTabControl1.HeaderOrientation = DevExpress.XtraTab.TabOrientation.Horizontal; - this.xtraTabControl1.Location = new System.Drawing.Point(260, 0); + this.xtraTabControl1.Location = new System.Drawing.Point(520, 0); + this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt; - this.xtraTabControl1.Size = new System.Drawing.Size(624, 605); + this.xtraTabControl1.Size = new System.Drawing.Size(1248, 1115); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPacsRpt, @@ -1901,8 +1944,9 @@ // tabPacsRpt // this.tabPacsRpt.Controls.Add(this.panelPacsRpt); + this.tabPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPacsRpt.Name = "tabPacsRpt"; - this.tabPacsRpt.Size = new System.Drawing.Size(580, 599); + this.tabPacsRpt.Size = new System.Drawing.Size(1167, 1103); this.tabPacsRpt.Text = "报告"; // // panelPacsRpt @@ -1912,15 +1956,17 @@ this.panelPacsRpt.Controls.Add(this.pictureBoxPacsRpt); this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsRpt.Location = new System.Drawing.Point(0, 0); + this.panelPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelPacsRpt.Name = "panelPacsRpt"; - this.panelPacsRpt.Size = new System.Drawing.Size(580, 599); + this.panelPacsRpt.Size = new System.Drawing.Size(1167, 1103); this.panelPacsRpt.TabIndex = 3; // // pictureBoxPacsRpt // this.pictureBoxPacsRpt.BackColor = System.Drawing.Color.White; this.pictureBoxPacsRpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBoxPacsRpt.Location = new System.Drawing.Point(8, 8); + this.pictureBoxPacsRpt.Location = new System.Drawing.Point(16, 15); + this.pictureBoxPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.pictureBoxPacsRpt.Name = "pictureBoxPacsRpt"; this.pictureBoxPacsRpt.Size = new System.Drawing.Size(10, 10); this.pictureBoxPacsRpt.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -1930,8 +1976,9 @@ // tabPacsImg // this.tabPacsImg.Controls.Add(this.panel12); + this.tabPacsImg.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPacsImg.Name = "tabPacsImg"; - this.tabPacsImg.Size = new System.Drawing.Size(580, 599); + this.tabPacsImg.Size = new System.Drawing.Size(1167, 1091); this.tabPacsImg.Text = "图片"; // // panel12 @@ -1939,8 +1986,9 @@ this.panel12.Controls.Add(this.panel13); this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; this.panel12.Location = new System.Drawing.Point(0, 0); + this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(580, 599); + this.panel12.Size = new System.Drawing.Size(1167, 1091); this.panel12.TabIndex = 3; // // panel13 @@ -1949,8 +1997,9 @@ this.panel13.Controls.Add(this.panel15); this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; this.panel13.Location = new System.Drawing.Point(0, 0); + this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(580, 599); + this.panel13.Size = new System.Drawing.Size(1167, 1091); this.panel13.TabIndex = 6; // // panel15 @@ -1958,8 +2007,9 @@ this.panel15.Controls.Add(this.panelPacsImg); this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; this.panel15.Location = new System.Drawing.Point(0, 0); + this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(580, 599); + this.panel15.Size = new System.Drawing.Size(1167, 1091); this.panel15.TabIndex = 4; // // panelPacsImg @@ -1968,8 +2018,9 @@ this.panelPacsImg.Controls.Add(this.flowLayoutPanelPacsImg); this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsImg.Location = new System.Drawing.Point(0, 0); + this.panelPacsImg.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelPacsImg.Name = "panelPacsImg"; - this.panelPacsImg.Size = new System.Drawing.Size(580, 599); + this.panelPacsImg.Size = new System.Drawing.Size(1167, 1091); this.panelPacsImg.TabIndex = 5; // // flowLayoutPanelPacsImg @@ -1979,7 +2030,7 @@ this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg"; - this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(580, 599); + this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(1167, 1091); this.flowLayoutPanelPacsImg.TabIndex = 0; // // panelPacsRptList @@ -1987,17 +2038,20 @@ this.panelPacsRptList.Controls.Add(this.DgcRptPacs); this.panelPacsRptList.Dock = System.Windows.Forms.DockStyle.Left; this.panelPacsRptList.Location = new System.Drawing.Point(0, 0); + this.panelPacsRptList.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelPacsRptList.Name = "panelPacsRptList"; - this.panelPacsRptList.Size = new System.Drawing.Size(260, 605); + this.panelPacsRptList.Size = new System.Drawing.Size(520, 1115); this.panelPacsRptList.TabIndex = 0; // // DgcRptPacs // this.DgcRptPacs.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcRptPacs.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcRptPacs.Location = new System.Drawing.Point(0, 0); this.DgcRptPacs.MainView = this.DgvRptPacs; + this.DgcRptPacs.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcRptPacs.Name = "DgcRptPacs"; - this.DgcRptPacs.Size = new System.Drawing.Size(260, 605); + this.DgcRptPacs.Size = new System.Drawing.Size(520, 1115); this.DgcRptPacs.TabIndex = 1; this.DgcRptPacs.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRptPacs}); @@ -2062,8 +2116,9 @@ // this.tabPageReport.Controls.Add(this.panelReportBase); this.tabPageReport.Image = global::PEIS.Properties.Resources.menu; + this.tabPageReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageReport.Name = "tabPageReport"; - this.tabPageReport.Size = new System.Drawing.Size(884, 605); + this.tabPageReport.Size = new System.Drawing.Size(1768, 1115); this.tabPageReport.Text = "其他报告"; // // panelReportBase @@ -2072,8 +2127,9 @@ this.panelReportBase.Controls.Add(this.DgcRptExt); this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelReportBase.Location = new System.Drawing.Point(0, 0); + this.panelReportBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelReportBase.Name = "panelReportBase"; - this.panelReportBase.Size = new System.Drawing.Size(884, 605); + this.panelReportBase.Size = new System.Drawing.Size(1768, 1115); this.panelReportBase.TabIndex = 0; // // panelReport @@ -2082,16 +2138,18 @@ this.panelReport.BackColor = System.Drawing.Color.WhiteSmoke; this.panelReport.Controls.Add(this.PictureBoxReportExt); this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelReport.Location = new System.Drawing.Point(260, 0); + this.panelReport.Location = new System.Drawing.Point(520, 0); + this.panelReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelReport.Name = "panelReport"; - this.panelReport.Size = new System.Drawing.Size(624, 605); + this.panelReport.Size = new System.Drawing.Size(1248, 1115); this.panelReport.TabIndex = 2; // // PictureBoxReportExt // this.PictureBoxReportExt.BackColor = System.Drawing.Color.White; this.PictureBoxReportExt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.PictureBoxReportExt.Location = new System.Drawing.Point(8, 8); + this.PictureBoxReportExt.Location = new System.Drawing.Point(16, 15); + this.PictureBoxReportExt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.PictureBoxReportExt.Name = "PictureBoxReportExt"; this.PictureBoxReportExt.Size = new System.Drawing.Size(10, 10); this.PictureBoxReportExt.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -2101,10 +2159,12 @@ // DgcRptExt // this.DgcRptExt.Dock = System.Windows.Forms.DockStyle.Left; + this.DgcRptExt.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcRptExt.Location = new System.Drawing.Point(0, 0); this.DgcRptExt.MainView = this.DgvRptExt; + this.DgcRptExt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcRptExt.Name = "DgcRptExt"; - this.DgcRptExt.Size = new System.Drawing.Size(260, 605); + this.DgcRptExt.Size = new System.Drawing.Size(520, 1115); this.DgcRptExt.TabIndex = 1; this.DgcRptExt.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRptExt}); @@ -2157,8 +2217,9 @@ // // tabPageHistory // + this.tabPageHistory.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tabPageHistory.Name = "tabPageHistory"; - this.tabPageHistory.Size = new System.Drawing.Size(884, 605); + this.tabPageHistory.Size = new System.Drawing.Size(1768, 1115); this.tabPageHistory.Text = "历史结果"; // // panelPatientInfo @@ -2166,11 +2227,11 @@ this.panelPatientInfo.BackColor = System.Drawing.Color.White; this.panelPatientInfo.Controls.Add(this.panel3); this.panelPatientInfo.Dock = System.Windows.Forms.DockStyle.Top; - this.panelPatientInfo.Location = new System.Drawing.Point(0, 45); + this.panelPatientInfo.Location = new System.Drawing.Point(0, 82); this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0); this.panelPatientInfo.Name = "panelPatientInfo"; - this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1); - this.panelPatientInfo.Size = new System.Drawing.Size(1205, 136); + this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panelPatientInfo.Size = new System.Drawing.Size(2645, 248); this.panelPatientInfo.TabIndex = 59; // // panel3 @@ -2179,23 +2240,24 @@ this.panel3.Controls.Add(this.tableLayoutPanel1); this.panel3.Controls.Add(this.panel4); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(1, 1); + this.panel3.Location = new System.Drawing.Point(2, 2); + this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1203, 134); + this.panel3.Size = new System.Drawing.Size(2641, 244); this.panel3.TabIndex = 1; // // tableLayoutPanel1 // this.tableLayoutPanel1.ColumnCount = 10; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 135F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 270F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0); this.tableLayoutPanel1.Controls.Add(this.label9, 0, 1); @@ -2233,15 +2295,16 @@ this.tableLayoutPanel1.Controls.Add(this.lblCardNo, 9, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tableLayoutPanel1.Location = new System.Drawing.Point(125, 0); + this.tableLayoutPanel1.Location = new System.Drawing.Point(250, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5); + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9); this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1078, 134); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2391, 244); this.tableLayoutPanel1.TabIndex = 69; // // label3 @@ -2249,10 +2312,10 @@ this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label3.Location = new System.Drawing.Point(5, 5); + this.label3.Location = new System.Drawing.Point(10, 9); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(45, 31); + this.label3.Size = new System.Drawing.Size(90, 56); this.label3.TabIndex = 34; this.label3.Text = "姓名："; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2262,10 +2325,10 @@ this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Dock = System.Windows.Forms.DockStyle.Fill; this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label9.Location = new System.Drawing.Point(5, 36); + this.label9.Location = new System.Drawing.Point(10, 65); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(45, 31); + this.label9.Size = new System.Drawing.Size(90, 56); this.label9.TabIndex = 42; this.label9.Text = "性别："; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2276,10 +2339,10 @@ this.lblGroupName.BackColor = System.Drawing.Color.Transparent; this.lblGroupName.Dock = System.Windows.Forms.DockStyle.Fill; this.lblGroupName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblGroupName.Location = new System.Drawing.Point(709, 98); + this.lblGroupName.Location = new System.Drawing.Point(1418, 177); this.lblGroupName.Margin = new System.Windows.Forms.Padding(0); this.lblGroupName.Name = "lblGroupName"; - this.lblGroupName.Size = new System.Drawing.Size(160, 31); + this.lblGroupName.Size = new System.Drawing.Size(320, 58); this.lblGroupName.TabIndex = 65; this.lblGroupName.Text = " "; this.lblGroupName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2290,10 +2353,10 @@ this.lblOrgName.BackColor = System.Drawing.Color.Transparent; this.lblOrgName.Dock = System.Windows.Forms.DockStyle.Fill; this.lblOrgName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblOrgName.Location = new System.Drawing.Point(709, 67); + this.lblOrgName.Location = new System.Drawing.Point(1418, 121); this.lblOrgName.Margin = new System.Windows.Forms.Padding(0); this.lblOrgName.Name = "lblOrgName"; - this.lblOrgName.Size = new System.Drawing.Size(160, 31); + this.lblOrgName.Size = new System.Drawing.Size(320, 56); this.lblOrgName.TabIndex = 57; this.lblOrgName.Text = " "; this.lblOrgName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2304,10 +2367,10 @@ this.lblAddress.BackColor = System.Drawing.Color.Transparent; this.lblAddress.Dock = System.Windows.Forms.DockStyle.Fill; this.lblAddress.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblAddress.Location = new System.Drawing.Point(709, 5); + this.lblAddress.Location = new System.Drawing.Point(1418, 9); this.lblAddress.Margin = new System.Windows.Forms.Padding(0); this.lblAddress.Name = "lblAddress"; - this.lblAddress.Size = new System.Drawing.Size(160, 31); + this.lblAddress.Size = new System.Drawing.Size(320, 56); this.lblAddress.TabIndex = 41; this.lblAddress.Text = " "; this.lblAddress.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2317,10 +2380,10 @@ this.label7.BackColor = System.Drawing.Color.Transparent; this.label7.Dock = System.Windows.Forms.DockStyle.Fill; this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label7.Location = new System.Drawing.Point(641, 5); + this.label7.Location = new System.Drawing.Point(1282, 9); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(68, 31); + this.label7.Size = new System.Drawing.Size(136, 56); this.label7.TabIndex = 40; this.label7.Text = "联系地址："; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2330,10 +2393,10 @@ this.label15.BackColor = System.Drawing.Color.Transparent; this.label15.Dock = System.Windows.Forms.DockStyle.Fill; this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(641, 36); + this.label15.Location = new System.Drawing.Point(1282, 65); this.label15.Margin = new System.Windows.Forms.Padding(0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(68, 31); + this.label15.Size = new System.Drawing.Size(136, 56); this.label15.TabIndex = 48; this.label15.Text = "团体号："; this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2343,10 +2406,10 @@ this.label23.BackColor = System.Drawing.Color.Transparent; this.label23.Dock = System.Windows.Forms.DockStyle.Fill; this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label23.Location = new System.Drawing.Point(641, 67); + this.label23.Location = new System.Drawing.Point(1282, 121); this.label23.Margin = new System.Windows.Forms.Padding(0); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(68, 31); + this.label23.Size = new System.Drawing.Size(136, 56); this.label23.TabIndex = 56; this.label23.Text = "团体名称："; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2356,10 +2419,10 @@ this.label31.BackColor = System.Drawing.Color.Transparent; this.label31.Dock = System.Windows.Forms.DockStyle.Fill; this.label31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(641, 98); + this.label31.Location = new System.Drawing.Point(1282, 177); this.label31.Margin = new System.Windows.Forms.Padding(0); this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(68, 31); + this.label31.Size = new System.Drawing.Size(136, 58); this.label31.TabIndex = 64; this.label31.Text = "分组名称："; this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2370,10 +2433,10 @@ this.lblOccupation.BackColor = System.Drawing.Color.Transparent; this.lblOccupation.Dock = System.Windows.Forms.DockStyle.Fill; this.lblOccupation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblOccupation.Location = new System.Drawing.Point(481, 5); + this.lblOccupation.Location = new System.Drawing.Point(962, 9); this.lblOccupation.Margin = new System.Windows.Forms.Padding(0); this.lblOccupation.Name = "lblOccupation"; - this.lblOccupation.Size = new System.Drawing.Size(160, 31); + this.lblOccupation.Size = new System.Drawing.Size(320, 56); this.lblOccupation.TabIndex = 39; this.lblOccupation.Text = " "; this.lblOccupation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2383,10 +2446,10 @@ this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label5.Location = new System.Drawing.Point(413, 5); + this.label5.Location = new System.Drawing.Point(826, 9); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(68, 31); + this.label5.Size = new System.Drawing.Size(136, 56); this.label5.TabIndex = 38; this.label5.Text = "职业："; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2397,10 +2460,10 @@ this.lblMarriage.BackColor = System.Drawing.Color.Transparent; this.lblMarriage.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMarriage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblMarriage.Location = new System.Drawing.Point(481, 36); + this.lblMarriage.Location = new System.Drawing.Point(962, 65); this.lblMarriage.Margin = new System.Windows.Forms.Padding(0); this.lblMarriage.Name = "lblMarriage"; - this.lblMarriage.Size = new System.Drawing.Size(160, 31); + this.lblMarriage.Size = new System.Drawing.Size(320, 56); this.lblMarriage.TabIndex = 47; this.lblMarriage.Text = " "; this.lblMarriage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2410,10 +2473,10 @@ this.label10.BackColor = System.Drawing.Color.Transparent; this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(185, 5); + this.label10.Location = new System.Drawing.Point(370, 9); this.label10.Margin = new System.Windows.Forms.Padding(0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(68, 31); + this.label10.Size = new System.Drawing.Size(136, 56); this.label10.TabIndex = 36; this.label10.Text = "体检号："; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2424,10 +2487,10 @@ this.lblEid.BackColor = System.Drawing.Color.Transparent; this.lblEid.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEid.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblEid.Location = new System.Drawing.Point(253, 5); + this.lblEid.Location = new System.Drawing.Point(506, 9); this.lblEid.Margin = new System.Windows.Forms.Padding(0); this.lblEid.Name = "lblEid"; - this.lblEid.Size = new System.Drawing.Size(160, 31); + this.lblEid.Size = new System.Drawing.Size(320, 56); this.lblEid.TabIndex = 37; this.lblEid.Text = " "; this.lblEid.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2437,10 +2500,10 @@ this.label13.BackColor = System.Drawing.Color.Transparent; this.label13.Dock = System.Windows.Forms.DockStyle.Fill; this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(413, 36); + this.label13.Location = new System.Drawing.Point(826, 65); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(68, 31); + this.label13.Size = new System.Drawing.Size(136, 56); this.label13.TabIndex = 46; this.label13.Text = "婚姻状况："; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2451,10 +2514,10 @@ this.lblTel.BackColor = System.Drawing.Color.Transparent; this.lblTel.Dock = System.Windows.Forms.DockStyle.Fill; this.lblTel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblTel.Location = new System.Drawing.Point(481, 98); + this.lblTel.Location = new System.Drawing.Point(962, 177); this.lblTel.Margin = new System.Windows.Forms.Padding(0); this.lblTel.Name = "lblTel"; - this.lblTel.Size = new System.Drawing.Size(160, 31); + this.lblTel.Size = new System.Drawing.Size(320, 58); this.lblTel.TabIndex = 63; this.lblTel.Text = " "; this.lblTel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2465,10 +2528,10 @@ this.lblName.BackColor = System.Drawing.Color.Transparent; this.lblName.Dock = System.Windows.Forms.DockStyle.Fill; this.lblName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblName.Location = new System.Drawing.Point(50, 5); + this.lblName.Location = new System.Drawing.Point(100, 9); this.lblName.Margin = new System.Windows.Forms.Padding(0); this.lblName.Name = "lblName"; - this.lblName.Size = new System.Drawing.Size(135, 31); + this.lblName.Size = new System.Drawing.Size(270, 56); this.lblName.TabIndex = 35; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -2477,10 +2540,10 @@ this.label16.BackColor = System.Drawing.Color.Transparent; this.label16.Dock = System.Windows.Forms.DockStyle.Fill; this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(5, 67); + this.label16.Location = new System.Drawing.Point(10, 121); this.label16.Margin = new System.Windows.Forms.Padding(0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(45, 31); + this.label16.Size = new System.Drawing.Size(90, 56); this.label16.TabIndex = 50; this.label16.Text = "年龄："; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2490,10 +2553,10 @@ this.label21.BackColor = System.Drawing.Color.Transparent; this.label21.Dock = System.Windows.Forms.DockStyle.Fill; this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(413, 67); + this.label21.Location = new System.Drawing.Point(826, 121); this.label21.Margin = new System.Windows.Forms.Padding(0); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(68, 31); + this.label21.Size = new System.Drawing.Size(136, 56); this.label21.TabIndex = 54; this.label21.Text = "教育程度："; this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2504,10 +2567,10 @@ this.lblType.BackColor = System.Drawing.Color.Transparent; this.lblType.Dock = System.Windows.Forms.DockStyle.Fill; this.lblType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblType.Location = new System.Drawing.Point(253, 36); + this.lblType.Location = new System.Drawing.Point(506, 65); this.lblType.Margin = new System.Windows.Forms.Padding(0); this.lblType.Name = "lblType"; - this.lblType.Size = new System.Drawing.Size(160, 31); + this.lblType.Size = new System.Drawing.Size(320, 56); this.lblType.TabIndex = 45; this.lblType.Text = " "; this.lblType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2517,10 +2580,10 @@ this.label25.BackColor = System.Drawing.Color.Transparent; this.label25.Dock = System.Windows.Forms.DockStyle.Fill; this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(5, 98); + this.label25.Location = new System.Drawing.Point(10, 177); this.label25.Margin = new System.Windows.Forms.Padding(0); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(45, 31); + this.label25.Size = new System.Drawing.Size(90, 58); this.label25.TabIndex = 58; this.label25.Text = "民族："; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2530,10 +2593,10 @@ this.label29.BackColor = System.Drawing.Color.Transparent; this.label29.Dock = System.Windows.Forms.DockStyle.Fill; this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label29.Location = new System.Drawing.Point(413, 98); + this.label29.Location = new System.Drawing.Point(826, 177); this.label29.Margin = new System.Windows.Forms.Padding(0); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(68, 31); + this.label29.Size = new System.Drawing.Size(136, 58); this.label29.TabIndex = 62; this.label29.Text = "联系电话："; this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2544,10 +2607,10 @@ this.lblSex.BackColor = System.Drawing.Color.Transparent; this.lblSex.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSex.Location = new System.Drawing.Point(50, 36); + this.lblSex.Location = new System.Drawing.Point(100, 65); this.lblSex.Margin = new System.Windows.Forms.Padding(0); this.lblSex.Name = "lblSex"; - this.lblSex.Size = new System.Drawing.Size(135, 31); + this.lblSex.Size = new System.Drawing.Size(270, 56); this.lblSex.TabIndex = 43; this.lblSex.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -2556,10 +2619,10 @@ this.label22.BackColor = System.Drawing.Color.Transparent; this.label22.Dock = System.Windows.Forms.DockStyle.Fill; this.label22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label22.Location = new System.Drawing.Point(185, 36); + this.label22.Location = new System.Drawing.Point(370, 65); this.label22.Margin = new System.Windows.Forms.Padding(0); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(68, 31); + this.label22.Size = new System.Drawing.Size(136, 56); this.label22.TabIndex = 44; this.label22.Text = "体检类别："; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2570,10 +2633,10 @@ this.lblAge.BackColor = System.Drawing.Color.Transparent; this.lblAge.Dock = System.Windows.Forms.DockStyle.Fill; this.lblAge.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblAge.Location = new System.Drawing.Point(50, 67); + this.lblAge.Location = new System.Drawing.Point(100, 121); this.lblAge.Margin = new System.Windows.Forms.Padding(0); this.lblAge.Name = "lblAge"; - this.lblAge.Size = new System.Drawing.Size(135, 31); + this.lblAge.Size = new System.Drawing.Size(270, 56); this.lblAge.TabIndex = 51; this.lblAge.Text = " "; this.lblAge.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2584,10 +2647,10 @@ this.lblNation.BackColor = System.Drawing.Color.Transparent; this.lblNation.Dock = System.Windows.Forms.DockStyle.Fill; this.lblNation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblNation.Location = new System.Drawing.Point(50, 98); + this.lblNation.Location = new System.Drawing.Point(100, 177); this.lblNation.Margin = new System.Windows.Forms.Padding(0); this.lblNation.Name = "lblNation"; - this.lblNation.Size = new System.Drawing.Size(135, 31); + this.lblNation.Size = new System.Drawing.Size(270, 58); this.lblNation.TabIndex = 59; this.lblNation.Text = " "; this.lblNation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2597,10 +2660,10 @@ this.label28.BackColor = System.Drawing.Color.Transparent; this.label28.Dock = System.Windows.Forms.DockStyle.Fill; this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label28.Location = new System.Drawing.Point(185, 67); + this.label28.Location = new System.Drawing.Point(370, 121); this.label28.Margin = new System.Windows.Forms.Padding(0); this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(68, 31); + this.label28.Size = new System.Drawing.Size(136, 56); this.label28.TabIndex = 52; this.label28.Text = "体检日期："; this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2610,10 +2673,10 @@ this.label33.BackColor = System.Drawing.Color.Transparent; this.label33.Dock = System.Windows.Forms.DockStyle.Fill; this.label33.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label33.Location = new System.Drawing.Point(185, 98); + this.label33.Location = new System.Drawing.Point(370, 177); this.label33.Margin = new System.Windows.Forms.Padding(0); this.label33.Name = "label33"; - this.label33.Size = new System.Drawing.Size(68, 31); + this.label33.Size = new System.Drawing.Size(136, 58); this.label33.TabIndex = 60; this.label33.Text = "签到时间："; this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2624,10 +2687,10 @@ this.lblSignTime.BackColor = System.Drawing.Color.Transparent; this.lblSignTime.Dock = System.Windows.Forms.DockStyle.Fill; this.lblSignTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSignTime.Location = new System.Drawing.Point(253, 98); + this.lblSignTime.Location = new System.Drawing.Point(506, 177); this.lblSignTime.Margin = new System.Windows.Forms.Padding(0); this.lblSignTime.Name = "lblSignTime"; - this.lblSignTime.Size = new System.Drawing.Size(160, 31); + this.lblSignTime.Size = new System.Drawing.Size(320, 58); this.lblSignTime.TabIndex = 61; this.lblSignTime.Text = " "; this.lblSignTime.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2638,10 +2701,10 @@ this.lblExamDate.BackColor = System.Drawing.Color.Transparent; this.lblExamDate.Dock = System.Windows.Forms.DockStyle.Fill; this.lblExamDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblExamDate.Location = new System.Drawing.Point(253, 67); + this.lblExamDate.Location = new System.Drawing.Point(506, 121); this.lblExamDate.Margin = new System.Windows.Forms.Padding(0); this.lblExamDate.Name = "lblExamDate"; - this.lblExamDate.Size = new System.Drawing.Size(160, 31); + this.lblExamDate.Size = new System.Drawing.Size(320, 56); this.lblExamDate.TabIndex = 53; this.lblExamDate.Text = " "; this.lblExamDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2652,10 +2715,10 @@ this.lblEducation.BackColor = System.Drawing.Color.Transparent; this.lblEducation.Dock = System.Windows.Forms.DockStyle.Fill; this.lblEducation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblEducation.Location = new System.Drawing.Point(481, 67); + this.lblEducation.Location = new System.Drawing.Point(962, 121); this.lblEducation.Margin = new System.Windows.Forms.Padding(0); this.lblEducation.Name = "lblEducation"; - this.lblEducation.Size = new System.Drawing.Size(160, 31); + this.lblEducation.Size = new System.Drawing.Size(320, 56); this.lblEducation.TabIndex = 55; this.lblEducation.Text = " "; this.lblEducation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2666,10 +2729,10 @@ this.lblOeid.BackColor = System.Drawing.Color.Transparent; this.lblOeid.Dock = System.Windows.Forms.DockStyle.Fill; this.lblOeid.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblOeid.Location = new System.Drawing.Point(709, 36); + this.lblOeid.Location = new System.Drawing.Point(1418, 65); this.lblOeid.Margin = new System.Windows.Forms.Padding(0); this.lblOeid.Name = "lblOeid"; - this.lblOeid.Size = new System.Drawing.Size(160, 31); + this.lblOeid.Size = new System.Drawing.Size(320, 56); this.lblOeid.TabIndex = 49; this.lblOeid.Text = " "; this.lblOeid.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2677,9 +2740,10 @@ // label1 // this.label1.Dock = System.Windows.Forms.DockStyle.Fill; - this.label1.Location = new System.Drawing.Point(872, 5); + this.label1.Location = new System.Drawing.Point(1744, 9); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(62, 31); + this.label1.Size = new System.Drawing.Size(124, 56); this.label1.TabIndex = 66; this.label1.Text = "证件号:"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -2687,9 +2751,10 @@ // lblCardNo // this.lblCardNo.Dock = System.Windows.Forms.DockStyle.Fill; - this.lblCardNo.Location = new System.Drawing.Point(940, 5); + this.lblCardNo.Location = new System.Drawing.Point(1880, 9); + this.lblCardNo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.lblCardNo.Name = "lblCardNo"; - this.lblCardNo.Size = new System.Drawing.Size(130, 31); + this.lblCardNo.Size = new System.Drawing.Size(495, 56); this.lblCardNo.TabIndex = 67; this.lblCardNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -2701,18 +2766,18 @@ this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Margin = new System.Windows.Forms.Padding(0); this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(5); - this.panel4.Size = new System.Drawing.Size(125, 134); + this.panel4.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9); + this.panel4.Size = new System.Drawing.Size(250, 244); this.panel4.TabIndex = 68; // // picWeChat // this.picWeChat.BackColor = System.Drawing.Color.WhiteSmoke; this.picWeChat.Image = global::PEIS.Properties.Resources.wechatlogo; - this.picWeChat.Location = new System.Drawing.Point(84, 91); + this.picWeChat.Location = new System.Drawing.Point(168, 166); this.picWeChat.Margin = new System.Windows.Forms.Padding(0); this.picWeChat.Name = "picWeChat"; - this.picWeChat.Size = new System.Drawing.Size(35, 35); + this.picWeChat.Size = new System.Drawing.Size(70, 64); this.picWeChat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.picWeChat.TabIndex = 35; this.picWeChat.TabStop = false; @@ -2723,10 +2788,10 @@ this.picAvatar.BackColor = System.Drawing.Color.WhiteSmoke; this.picAvatar.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.picAvatar.Dock = System.Windows.Forms.DockStyle.Fill; - this.picAvatar.Location = new System.Drawing.Point(5, 5); + this.picAvatar.Location = new System.Drawing.Point(10, 9); this.picAvatar.Margin = new System.Windows.Forms.Padding(0); this.picAvatar.Name = "picAvatar"; - this.picAvatar.Size = new System.Drawing.Size(115, 124); + this.picAvatar.Size = new System.Drawing.Size(230, 226); this.picAvatar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.picAvatar.TabIndex = 34; this.picAvatar.TabStop = false; @@ -2736,8 +2801,9 @@ this.panelMenu.Controls.Add(this.menuStrip); this.panelMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelMenu.Location = new System.Drawing.Point(0, 0); + this.panelMenu.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panelMenu.Name = "panelMenu"; - this.panelMenu.Size = new System.Drawing.Size(1205, 45); + this.panelMenu.Size = new System.Drawing.Size(2645, 82); this.panelMenu.TabIndex = 58; // // menuStrip @@ -2757,9 +2823,9 @@ this.toolStripTxtStatus}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0); + this.menuStrip.Padding = new System.Windows.Forms.Padding(4, 0, 10, 0); this.menuStrip.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.menuStrip.Size = new System.Drawing.Size(1205, 45); + this.menuStrip.Size = new System.Drawing.Size(2645, 82); this.menuStrip.TabIndex = 58; this.menuStrip.Text = "menuStrip2"; // @@ -2769,7 +2835,7 @@ this.TsmiWeChatViewReport.ForeColor = System.Drawing.Color.Red; this.TsmiWeChatViewReport.Image = global::PEIS.Properties.Resources.WeChat; this.TsmiWeChatViewReport.Name = "TsmiWeChatViewReport"; - this.TsmiWeChatViewReport.Size = new System.Drawing.Size(171, 45); + this.TsmiWeChatViewReport.Size = new System.Drawing.Size(303, 82); this.TsmiWeChatViewReport.Text = "已禁止微信查看报告"; // // TsmiAbandoned @@ -2777,7 +2843,7 @@ this.TsmiAbandoned.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.TsmiAbandoned.Image = ((System.Drawing.Image)(resources.GetObject("TsmiAbandoned.Image"))); this.TsmiAbandoned.Name = "TsmiAbandoned"; - this.TsmiAbandoned.Size = new System.Drawing.Size(101, 45); + this.TsmiAbandoned.Size = new System.Drawing.Size(163, 82); this.TsmiAbandoned.Text = "预览报告"; // // TsmiFinishCancel @@ -2785,7 +2851,7 @@ this.TsmiFinishCancel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.TsmiFinishCancel.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFinishCancel.Image"))); this.TsmiFinishCancel.Name = "TsmiFinishCancel"; - this.TsmiFinishCancel.Size = new System.Drawing.Size(101, 45); + this.TsmiFinishCancel.Size = new System.Drawing.Size(163, 82); this.TsmiFinishCancel.Text = "取消完结"; // // TsmiFinish @@ -2793,13 +2859,13 @@ this.TsmiFinish.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; this.TsmiFinish.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFinish.Image"))); this.TsmiFinish.Name = "TsmiFinish"; - this.TsmiFinish.Size = new System.Drawing.Size(73, 45); + this.TsmiFinish.Size = new System.Drawing.Size(107, 82); this.TsmiFinish.Text = "完结"; // // ToolStripMenuItemStatusTxt // this.ToolStripMenuItemStatusTxt.Name = "ToolStripMenuItemStatusTxt"; - this.ToolStripMenuItemStatusTxt.Size = new System.Drawing.Size(91, 45); + this.ToolStripMenuItemStatusTxt.Size = new System.Drawing.Size(167, 82); this.ToolStripMenuItemStatusTxt.Text = "体检状态："; this.ToolStripMenuItemStatusTxt.Visible = false; // @@ -2809,7 +2875,7 @@ this.toolStripTxtStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F); this.toolStripTxtStatus.Name = "toolStripTxtStatus"; this.toolStripTxtStatus.ReadOnly = true; - this.toolStripTxtStatus.Size = new System.Drawing.Size(180, 45); + this.toolStripTxtStatus.Size = new System.Drawing.Size(356, 82); this.toolStripTxtStatus.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolStripTxtStatus.Visible = false; // @@ -2843,11 +2909,11 @@ // // TotalForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1444, 825); + this.ClientSize = new System.Drawing.Size(2888, 1504); this.Controls.Add(this.splitContainerBase); - this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "TotalForm"; this.Text = "总检"; this.splitContainerBase.Panel1.ResumeLayout(false); diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx index 460837a..d8c7d4a 100644 --- a/PEIS/View/Exam/TotalForm.resx +++ b/PEIS/View/Exam/TotalForm.resx @@ -117,12 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 377, 55 - - - 497, 55 - 497, 55