From 68b9db0172bb0fbe0461fcda2badfed9826b5dec Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 25 Jul 2024 13:09:26 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AF=BC=E6=A3=80=E5=8D=95=E4=B8=8A?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=88=86=E7=BB=84?= =?UTF-8?q?=EF=BC=8C2=E3=80=81=E6=9C=AA=E5=88=86=E7=BB=84=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BA=E5=88=86=E7=BB=84=EF=BC=8C3?= =?UTF-8?q?=E3=80=81=E4=BD=93=E6=A3=80=E8=80=85=E5=A4=8D=E5=88=B6=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E6=90=9C=E7=B4=A2=E6=A1=86=EF=BC=8C4=E3=80=81?= =?UTF-8?q?=E5=BF=83=E7=94=B5=E5=9B=BE=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enrollment/EnrollmentPatientModel.cs | 2 +- PEIS/Model/ReportModel.cs | 43 +- PEIS/Presenter/EnrollmentPersonPresenter.cs | 2 +- PEIS/Utils/ReportHelper.cs | 65 ++- .../Enrollment/EnrollmentOrgForm.Designer.cs | 234 ++++----- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 15 +- .../EnrollmentPersonForm.Designer.cs | 465 +++++++++--------- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 77 +-- .../View/Enrollment/EnrollmentPersonForm.resx | 16 +- PEIS/View/Enrollment/IEnrollmentPersonView.cs | 2 +- 10 files changed, 471 insertions(+), 450 deletions(-) diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 90bb582..8f81e6c 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -270,7 +270,7 @@ namespace PEIS.Model.Enrollment public EnrollmentPatient GetEnrollmentPatient(Int64 EId) // 获取个人体检人员信息 { - var item = DAOHelp.GetDataBySQL($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE a.ID = {EId}"); + var item = DAOHelp.GetDataBySQL($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON a.PID = c.PID AND c.OID = a.OID WHERE a.ID = {EId}"); return item.Count != 0 ? item[0] : null; } } diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index d60e6ce..e234182 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -198,33 +198,38 @@ namespace PEIS.Model { using (MemoryStream memoryStream = new MemoryStream(heart[0].ReportImage)) { - // 图片格式 - //Image bitmap = Image.FromStream(memoryStream); - //using (MemoryStream stream = new MemoryStream()) - //{ - // bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone); - // bitmap.Save(stream, ImageFormat.Jpeg); - // var img = stream.ToArray(); - // pacs.Add(new Report { ReportImage = img }); - //} - - // PDF格式 - using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream)) + if (ReportHelper.IsPdf(heart[0].ReportImage)) { - for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++) + // PDF格式 + using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream)) { - using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false)) + for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++) { - using (MemoryStream stream = new MemoryStream()) + using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false)) { - bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone); - bitmap.Save(stream, ImageFormat.Jpeg); - var img = stream.ToArray(); - pacs.Add(new Report { ReportImage = img }); + using (MemoryStream stream = new MemoryStream()) + { + bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone); + bitmap.Save(stream, ImageFormat.Jpeg); + var img = stream.ToArray(); + pacs.Add(new Report { ReportImage = img }); + } } } } } + else + { + // 图片格式 + Image bitmap = Image.FromStream(memoryStream); + using (MemoryStream stream = new MemoryStream()) + { + bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone); + bitmap.Save(stream, ImageFormat.Jpeg); + var img = stream.ToArray(); + pacs.Add(new Report { ReportImage = img }); + } + } } } diff --git a/PEIS/Presenter/EnrollmentPersonPresenter.cs b/PEIS/Presenter/EnrollmentPersonPresenter.cs index b4f2101..d7900d6 100644 --- a/PEIS/Presenter/EnrollmentPersonPresenter.cs +++ b/PEIS/Presenter/EnrollmentPersonPresenter.cs @@ -35,7 +35,7 @@ namespace PEIS.Presenter // 获取登记列表 View.GetRegItems += (send, args) => { - View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name)); + View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name), args.Item.code); }; View.GetRegInfo += (send, args) => { diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index cc4877c..be0c5a4 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -42,35 +42,40 @@ namespace PEIS.Utils { try { - // 图片格式 - //using (var ms = new MemoryStream(pdf, 0, pdf.Length)) - //{ - // return Image.FromStream(ms, true); - //} - - // PDF格式 - using (var memoryStream = new MemoryStream(pdf)) + if (IsPdf(pdf)) { - using (var pdfDocument = PdfiumViewer.PdfDocument.Load(memoryStream)) + // PDF格式 + using (var memoryStream = new MemoryStream(pdf)) { - for (var pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++) + using (var pdfDocument = PdfiumViewer.PdfDocument.Load(memoryStream)) { - using (var bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false)) + for (var pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++) { - using (var stream = new MemoryStream()) + using (var bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false)) { - bitmap.Save(stream, ImageFormat.Jpeg); - var img = stream.ToArray(); - - using (var ms = new MemoryStream(img, 0, img.Length)) + using (var stream = new MemoryStream()) { - return Image.FromStream(ms, true); + bitmap.Save(stream, ImageFormat.Jpeg); + var img = stream.ToArray(); + + using (var ms = new MemoryStream(img, 0, img.Length)) + { + return Image.FromStream(ms, true); + } } } } } } } + else + { + // 图片格式 + using (var ms = new MemoryStream(pdf, 0, pdf.Length)) + { + return Image.FromStream(ms, true); + } + } } catch (Exception ex) { @@ -80,6 +85,28 @@ namespace PEIS.Utils return null; } + /// + /// 判断是否PDF + /// + /// + /// + public static bool IsPdf(byte[] fileBytes) + { + const string pdfSignature = "%PDF"; + if (fileBytes.Length >= pdfSignature.Length) + { + for (int i = 0; i < pdfSignature.Length; i++) + { + if (fileBytes[i] != pdfSignature[i]) + { + return false; + } + } + return true; + } + return false; + } + /// /// 获取报告单 /// @@ -499,14 +526,14 @@ namespace PEIS.Utils rpt.SetParameterValue("ExamDate", regInfo.SignTime?.ToShortDateString()); rpt.SetParameterValue("Marriage", regInfo.Marriage); rpt.SetParameterValue("TeamName", regInfo.OrgName); - rpt.SetParameterValue("GroupName", regInfo.GroupName); + rpt.SetParameterValue("GroupName", regInfo.DeptName); rpt.SetParameterValue("ExamType", regInfo.Type); rpt.SetParameterValue("Tel", regInfo.Tel1); rpt.SetParameterValue("Nation", regInfo.Nation); rpt.SetParameterValue("CardNo", regInfo.CardNo); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); - if (regInfo.Photo == null) + if (string.IsNullOrEmpty(regInfo.Photo)) { rpt.SetParameterValue("Avatar", regInfo.Photo); } diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 1143ca5..4a08f60 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -95,6 +95,7 @@ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.DgcPatient = new DevExpress.XtraGrid.GridControl(); this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -103,17 +104,12 @@ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit(); this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit(); this.panel10 = new System.Windows.Forms.Panel(); this.ImportBtn = new System.Windows.Forms.Button(); this.NewBaseBtn = new System.Windows.Forms.Button(); @@ -345,6 +341,7 @@ this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn(); this.PatientSearch = new System.Windows.Forms.TextBox(); @@ -378,7 +375,6 @@ 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.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -532,7 +528,7 @@ // DgcOrg // this.DgcOrg.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4); this.DgcOrg.Location = new System.Drawing.Point(0, 163); this.DgcOrg.MainView = this.DgvOrg; this.DgcOrg.Name = "DgcOrg"; @@ -564,7 +560,7 @@ this.gridColumn21}); this.DgvOrg.FixedLineWidth = 1; this.DgvOrg.GridControl = this.DgcOrg; - this.DgvOrg.IndicatorWidth = 70; + this.DgvOrg.IndicatorWidth = 40; this.DgvOrg.Name = "DgvOrg"; this.DgvOrg.OptionsMenu.EnableColumnMenu = false; this.DgvOrg.OptionsSelection.MultiSelect = true; @@ -868,7 +864,7 @@ // this.splitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter1.Location = new System.Drawing.Point(236, 0); - this.splitter1.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); + this.splitter1.Margin = new System.Windows.Forms.Padding(1); this.splitter1.Name = "splitter1"; this.splitter1.Size = new System.Drawing.Size(4, 779); this.splitter1.TabIndex = 1; @@ -1259,7 +1255,7 @@ this.splitter3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter3.Dock = System.Windows.Forms.DockStyle.Right; this.splitter3.Location = new System.Drawing.Point(658, 189); - this.splitter3.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); + this.splitter3.Margin = new System.Windows.Forms.Padding(1); this.splitter3.Name = "splitter3"; this.splitter3.Size = new System.Drawing.Size(4, 547); this.splitter3.TabIndex = 135; @@ -1308,6 +1304,7 @@ this.DgvPatient.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DgvPatient.Appearance.Row.Options.UseFont = true; this.DgvPatient.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn106, this.gridColumn20, this.gridColumn22, this.gridColumn26, @@ -1316,14 +1313,9 @@ this.gridColumn23, this.gridColumn24, this.gridColumn25, - this.gridColumn29, this.gridColumn30, this.gridColumn31, - this.gridColumn38, - this.gridColumn39, - this.gridColumn40, this.gridColumn41, - this.gridColumn42, this.gridColumn54, this.gridColumn56}); this.DgvPatient.FixedLineWidth = 1; @@ -1335,6 +1327,24 @@ this.DgvPatient.OptionsView.ShowGroupPanel = false; this.DgvPatient.RowHeight = 40; // + // gridColumn106 + // + this.gridColumn106.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn106.AppearanceCell.Options.UseFont = true; + this.gridColumn106.Caption = "部门"; + this.gridColumn106.FieldName = "DeptName"; + this.gridColumn106.Name = "gridColumn106"; + this.gridColumn106.OptionsColumn.AllowEdit = false; + this.gridColumn106.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn106.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn106.OptionsColumn.AllowMove = false; + this.gridColumn106.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn106.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn106.OptionsColumn.ReadOnly = true; + this.gridColumn106.OptionsFilter.AllowFilter = false; + this.gridColumn106.Visible = true; + this.gridColumn106.VisibleIndex = 0; + // // gridColumn20 // this.gridColumn20.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1348,7 +1358,7 @@ this.gridColumn20.OptionsColumn.ReadOnly = true; this.gridColumn20.OptionsFilter.AllowFilter = false; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 0; + this.gridColumn20.VisibleIndex = 1; this.gridColumn20.Width = 80; // // gridColumn22 @@ -1364,7 +1374,7 @@ this.gridColumn22.OptionsColumn.ReadOnly = true; this.gridColumn22.OptionsFilter.AllowFilter = false; this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 1; + this.gridColumn22.VisibleIndex = 2; this.gridColumn22.Width = 40; // // gridColumn26 @@ -1378,8 +1388,9 @@ this.gridColumn26.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn26.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn26.OptionsColumn.ReadOnly = true; + this.gridColumn26.OptionsFilter.AllowFilter = false; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 2; + this.gridColumn26.VisibleIndex = 3; this.gridColumn26.Width = 60; // // gridColumn27 @@ -1393,8 +1404,9 @@ this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn27.OptionsColumn.ReadOnly = true; + this.gridColumn27.OptionsFilter.AllowFilter = false; this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 3; + this.gridColumn27.VisibleIndex = 4; this.gridColumn27.Width = 60; // // gridColumn28 @@ -1410,7 +1422,7 @@ this.gridColumn28.OptionsColumn.ReadOnly = true; this.gridColumn28.OptionsFilter.AllowFilter = false; this.gridColumn28.Visible = true; - this.gridColumn28.VisibleIndex = 4; + this.gridColumn28.VisibleIndex = 5; this.gridColumn28.Width = 60; // // gridColumn23 @@ -1428,7 +1440,7 @@ this.gridColumn23.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 5; + this.gridColumn23.VisibleIndex = 6; this.gridColumn23.Width = 100; // // gridColumn24 @@ -1444,7 +1456,7 @@ this.gridColumn24.OptionsColumn.ReadOnly = true; this.gridColumn24.OptionsFilter.AllowFilter = false; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 6; + this.gridColumn24.VisibleIndex = 7; this.gridColumn24.Width = 80; // // gridColumn25 @@ -1460,23 +1472,9 @@ this.gridColumn25.OptionsColumn.ReadOnly = true; this.gridColumn25.OptionsFilter.AllowFilter = false; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 7; + this.gridColumn25.VisibleIndex = 8; this.gridColumn25.Width = 160; // - // gridColumn29 - // - this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn29.AppearanceCell.Options.UseFont = true; - this.gridColumn29.Caption = "职业"; - this.gridColumn29.FieldName = "Occupation"; - this.gridColumn29.Name = "gridColumn29"; - this.gridColumn29.OptionsColumn.AllowEdit = false; - this.gridColumn29.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn29.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn29.OptionsColumn.ReadOnly = true; - this.gridColumn29.Visible = true; - this.gridColumn29.VisibleIndex = 8; - // // gridColumn30 // this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1488,6 +1486,7 @@ this.gridColumn30.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn30.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn30.OptionsColumn.ReadOnly = true; + this.gridColumn30.OptionsFilter.AllowFilter = false; this.gridColumn30.Visible = true; this.gridColumn30.VisibleIndex = 9; this.gridColumn30.Width = 200; @@ -1501,54 +1500,11 @@ this.gridColumn31.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn31.OptionsColumn.ReadOnly = true; + this.gridColumn31.OptionsFilter.AllowFilter = false; this.gridColumn31.Visible = true; this.gridColumn31.VisibleIndex = 10; this.gridColumn31.Width = 200; // - // gridColumn38 - // - this.gridColumn38.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn38.AppearanceCell.Options.UseFont = true; - this.gridColumn38.Caption = "备注"; - this.gridColumn38.FieldName = "Description"; - this.gridColumn38.Name = "gridColumn38"; - this.gridColumn38.OptionsColumn.AllowEdit = false; - this.gridColumn38.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn38.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn38.OptionsColumn.ReadOnly = true; - this.gridColumn38.Visible = true; - this.gridColumn38.VisibleIndex = 12; - // - // gridColumn39 - // - this.gridColumn39.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn39.AppearanceCell.Options.UseFont = true; - this.gridColumn39.Caption = "建档时间"; - this.gridColumn39.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn39.FieldName = "CreateTime"; - this.gridColumn39.Name = "gridColumn39"; - this.gridColumn39.OptionsColumn.AllowEdit = false; - this.gridColumn39.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn39.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn39.OptionsColumn.ReadOnly = true; - this.gridColumn39.Visible = true; - this.gridColumn39.VisibleIndex = 13; - this.gridColumn39.Width = 130; - // - // gridColumn40 - // - this.gridColumn40.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn40.AppearanceCell.Options.UseFont = true; - this.gridColumn40.Caption = "建档人"; - this.gridColumn40.FieldName = "Creator"; - this.gridColumn40.Name = "gridColumn40"; - this.gridColumn40.OptionsColumn.AllowEdit = false; - this.gridColumn40.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn40.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn40.OptionsColumn.ReadOnly = true; - this.gridColumn40.Visible = true; - this.gridColumn40.VisibleIndex = 14; - // // gridColumn41 // this.gridColumn41.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1560,28 +1516,11 @@ this.gridColumn41.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; this.gridColumn41.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn41.OptionsColumn.ReadOnly = true; + this.gridColumn41.OptionsFilter.AllowFilter = false; this.gridColumn41.Visible = true; - this.gridColumn41.VisibleIndex = 15; + this.gridColumn41.VisibleIndex = 11; this.gridColumn41.Width = 40; // - // gridColumn42 - // - this.gridColumn42.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn42.AppearanceCell.Options.UseFont = true; - this.gridColumn42.Caption = "身份证照片"; - this.gridColumn42.ColumnEdit = this.repositoryItemImageEdit1; - this.gridColumn42.FieldName = "Photo"; - this.gridColumn42.Name = "gridColumn42"; - this.gridColumn42.Visible = true; - this.gridColumn42.VisibleIndex = 11; - // - // repositoryItemImageEdit1 - // - this.repositoryItemImageEdit1.AutoHeight = false; - this.repositoryItemImageEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemImageEdit1.Name = "repositoryItemImageEdit1"; - // // gridColumn54 // this.gridColumn54.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1589,8 +1528,11 @@ this.gridColumn54.Caption = "PID"; this.gridColumn54.FieldName = "PID"; this.gridColumn54.Name = "gridColumn54"; + this.gridColumn54.OptionsColumn.AllowEdit = false; + this.gridColumn54.OptionsColumn.ReadOnly = true; + this.gridColumn54.OptionsFilter.AllowFilter = false; this.gridColumn54.Visible = true; - this.gridColumn54.VisibleIndex = 16; + this.gridColumn54.VisibleIndex = 12; // // gridColumn56 // @@ -1599,8 +1541,23 @@ this.gridColumn56.Caption = "OID"; this.gridColumn56.FieldName = "OID"; this.gridColumn56.Name = "gridColumn56"; + this.gridColumn56.OptionsColumn.AllowEdit = false; + this.gridColumn56.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn56.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn56.OptionsColumn.AllowMove = false; + this.gridColumn56.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn56.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn56.OptionsColumn.ReadOnly = true; + this.gridColumn56.OptionsFilter.AllowFilter = false; this.gridColumn56.Visible = true; - this.gridColumn56.VisibleIndex = 17; + this.gridColumn56.VisibleIndex = 13; + // + // repositoryItemImageEdit1 + // + this.repositoryItemImageEdit1.AutoHeight = false; + this.repositoryItemImageEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.repositoryItemImageEdit1.Name = "repositoryItemImageEdit1"; // // panel10 // @@ -1667,7 +1624,7 @@ this.splitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitter2.Dock = System.Windows.Forms.DockStyle.Top; this.splitter2.Location = new System.Drawing.Point(0, 184); - this.splitter2.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1); + this.splitter2.Margin = new System.Windows.Forms.Padding(1); this.splitter2.Name = "splitter2"; this.splitter2.Size = new System.Drawing.Size(1196, 5); this.splitter2.TabIndex = 132; @@ -1909,7 +1866,7 @@ this.TpGroupFeeItem.Controls.Add(this.panel4); this.TpGroupFeeItem.Image = global::PEIS.Properties.Resources.收费项目; this.TpGroupFeeItem.Name = "TpGroupFeeItem"; - this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 922); + this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 736); this.TpGroupFeeItem.Text = "分组项目"; // // panel5 @@ -1922,7 +1879,7 @@ this.panel5.Location = new System.Drawing.Point(0, 192); this.panel5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel5.Name = "panel5"; - this.panel5.Size = new System.Drawing.Size(1196, 730); + this.panel5.Size = new System.Drawing.Size(1196, 544); this.panel5.TabIndex = 139; // // DgcGroupFeeItem @@ -1933,7 +1890,7 @@ this.DgcGroupFeeItem.Name = "DgcGroupFeeItem"; this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit1}); - this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 725); + this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 539); this.DgcGroupFeeItem.TabIndex = 137; this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroupFeeItem}); @@ -2133,7 +2090,7 @@ this.splitter4.Dock = System.Windows.Forms.DockStyle.Right; this.splitter4.Location = new System.Drawing.Point(732, 5); this.splitter4.Name = "splitter4"; - this.splitter4.Size = new System.Drawing.Size(4, 725); + this.splitter4.Size = new System.Drawing.Size(4, 539); this.splitter4.TabIndex = 142; this.splitter4.TabStop = false; // @@ -2144,7 +2101,7 @@ this.panel9.Location = new System.Drawing.Point(736, 5); this.panel9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel9.Name = "panel9"; - this.panel9.Size = new System.Drawing.Size(460, 725); + this.panel9.Size = new System.Drawing.Size(460, 539); this.panel9.TabIndex = 141; // // tabControl1 @@ -2156,17 +2113,17 @@ this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(460, 725); + this.tabControl1.Size = new System.Drawing.Size(460, 539); this.tabControl1.TabIndex = 139; // // TpPack // this.TpPack.Controls.Add(this.DgcPack); - this.TpPack.Location = new System.Drawing.Point(4, 24); + this.TpPack.Location = new System.Drawing.Point(4, 23); this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpPack.Name = "TpPack"; this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpPack.Size = new System.Drawing.Size(452, 708); + this.TpPack.Size = new System.Drawing.Size(452, 512); this.TpPack.TabIndex = 1; this.TpPack.Text = "套餐"; this.TpPack.UseVisualStyleBackColor = true; @@ -2177,7 +2134,7 @@ this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; this.DgcPack.Name = "DgcPack"; - this.DgcPack.Size = new System.Drawing.Size(448, 702); + this.DgcPack.Size = new System.Drawing.Size(448, 506); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2338,11 +2295,11 @@ // this.TpFeeItem.Controls.Add(this.DgcFeeItem); this.TpFeeItem.Controls.Add(this.FeeItemSearch); - this.TpFeeItem.Location = new System.Drawing.Point(4, 24); + this.TpFeeItem.Location = new System.Drawing.Point(4, 23); this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpFeeItem.Name = "TpFeeItem"; this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpFeeItem.Size = new System.Drawing.Size(452, 708); + this.TpFeeItem.Size = new System.Drawing.Size(452, 512); this.TpFeeItem.TabIndex = 0; this.TpFeeItem.Text = "收费项目"; this.TpFeeItem.UseVisualStyleBackColor = true; @@ -2355,7 +2312,7 @@ this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(448, 680); + this.DgcFeeItem.Size = new System.Drawing.Size(448, 484); this.DgcFeeItem.TabIndex = 137; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -4434,7 +4391,7 @@ this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(893, 44); + this.menuStrip1.Size = new System.Drawing.Size(789, 44); this.menuStrip1.TabIndex = 129; this.menuStrip1.Text = "menuStrip1"; // @@ -4563,6 +4520,7 @@ this.TsmiBatchCtrl.Name = "TsmiBatchCtrl"; this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40); this.TsmiBatchCtrl.Text = "批量操作"; + this.TsmiBatchCtrl.Visible = false; // // splitterControl1 // @@ -4695,7 +4653,7 @@ this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; this.DgvEnrollment.GroupFormat = ""; - this.DgvEnrollment.IndicatorWidth = 75; + this.DgvEnrollment.IndicatorWidth = 70; this.DgvEnrollment.Name = "DgvEnrollment"; this.DgvEnrollment.OptionsFilter.AllowFilterEditor = false; this.DgvEnrollment.OptionsMenu.EnableColumnMenu = false; @@ -4929,6 +4887,23 @@ this.gridColumn96.VisibleIndex = 9; this.gridColumn96.Width = 160; // + // gridColumn105 + // + this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn105.AppearanceCell.Options.UseFont = true; + this.gridColumn105.Caption = "联系方式"; + this.gridColumn105.FieldName = "Tel1"; + this.gridColumn105.Name = "gridColumn105"; + this.gridColumn105.OptionsColumn.AllowEdit = false; + this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.AllowMove = false; + this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn105.OptionsColumn.ReadOnly = true; + this.gridColumn105.OptionsFilter.AllowFilter = false; + this.gridColumn105.Visible = true; + this.gridColumn105.VisibleIndex = 11; + // // gridColumn104 // this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -5184,23 +5159,6 @@ // this.gridView8.Name = "gridView8"; // - // gridColumn105 - // - this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn105.AppearanceCell.Options.UseFont = true; - this.gridColumn105.Caption = "联系方式"; - this.gridColumn105.FieldName = "Tel1"; - this.gridColumn105.Name = "gridColumn105"; - this.gridColumn105.OptionsColumn.AllowEdit = false; - this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn105.OptionsColumn.AllowMove = false; - this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn105.OptionsColumn.ReadOnly = true; - this.gridColumn105.OptionsFilter.AllowFilter = false; - this.gridColumn105.Visible = true; - this.gridColumn105.VisibleIndex = 11; - // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -5489,14 +5447,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn39; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn40; private DevExpress.XtraGrid.Columns.GridColumn gridColumn41; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; private DevExpress.XtraEditors.Repository.RepositoryItemImageEdit repositoryItemImageEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn54; private DevExpress.XtraGrid.Columns.GridColumn gridColumn56; @@ -5667,5 +5620,6 @@ private System.Windows.Forms.ToolStripMenuItem FastExportTime; private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; private DevExpress.XtraGrid.Columns.GridColumn gridColumn105; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn106; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index d15e457..dbc3579 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1,5 +1,4 @@ -using DevExpress.Utils; -using DevExpress.XtraGrid.Columns; +using DevExpress.XtraGrid.Columns; using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraGrid.Views.Grid.ViewInfo; using DevExpress.XtraPrinting.Native; @@ -1458,32 +1457,32 @@ namespace PEIS.View.Enrollment e.Info.DisplayText = (e.RowHandle + 1).ToString(); } - private void DgvGroupFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvGroupFeeItem_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvGroupFeeItem.CalcHitInfo(e.X, e.Y); } - private void DgvFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvFeeItem_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvFeeItem.CalcHitInfo(e.X, e.Y); } - private void DgvPack_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvPack_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvPack.CalcHitInfo(e.X, e.Y); } - private void DgvGroupPatient_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvGroupPatient_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvGroupPatient.CalcHitInfo(e.X, e.Y); } - private void DgvPatient_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvPatient_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvPatient.CalcHitInfo(e.X, e.Y); } - private void DgvEnrollmentFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) + private void DgvEnrollmentFeeItem_MouseDown(object sender, MouseEventArgs e) { _hInfo = DgvEnrollmentFeeItem.CalcHitInfo(e.X, e.Y); } diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs index 5e7f3dd..25ea0c7 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs @@ -222,6 +222,8 @@ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.panel2 = new System.Windows.Forms.Panel(); + this.NameSearch2 = new System.Windows.Forms.TextBox(); this.DgcRegItem2 = new DevExpress.XtraGrid.GridControl(); this.DgvRegItem2 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -230,8 +232,8 @@ this.TsmiCopyFeeItem = new System.Windows.Forms.ToolStripMenuItem(); 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.repositoryItemMemoEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.RegListPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).BeginInit(); this.RegMenu.SuspendLayout(); @@ -285,6 +287,7 @@ this.CopyItemTab.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcCopyItem)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvCopyItem)).BeginInit(); + this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem2)).BeginInit(); this.CopyMenu.SuspendLayout(); @@ -569,21 +572,19 @@ this.RegListPanel.Controls.Add(this.groupBox2); this.RegListPanel.Dock = System.Windows.Forms.DockStyle.Left; this.RegListPanel.Location = new System.Drawing.Point(0, 0); - this.RegListPanel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.RegListPanel.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.RegListPanel.Name = "RegListPanel"; - this.RegListPanel.Size = new System.Drawing.Size(464, 1511); + this.RegListPanel.Size = new System.Drawing.Size(232, 779); this.RegListPanel.TabIndex = 13; // // DgcRegItem // this.DgcRegItem.ContextMenuStrip = this.RegMenu; this.DgcRegItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcRegItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcRegItem.Location = new System.Drawing.Point(0, 324); + this.DgcRegItem.Location = new System.Drawing.Point(0, 178); this.DgcRegItem.MainView = this.DgvRegItem; - this.DgcRegItem.Margin = new System.Windows.Forms.Padding(6); this.DgcRegItem.Name = "DgcRegItem"; - this.DgcRegItem.Size = new System.Drawing.Size(464, 1187); + this.DgcRegItem.Size = new System.Drawing.Size(232, 601); this.DgcRegItem.TabIndex = 134; this.DgcRegItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRegItem}); @@ -595,20 +596,20 @@ this.ExportExcel, this.FastRecallDept}); this.RegMenu.Name = "RegMenu"; - this.RegMenu.Size = new System.Drawing.Size(189, 76); + this.RegMenu.Size = new System.Drawing.Size(129, 56); // // ExportExcel // this.ExportExcel.Image = global::PEIS.Properties.Resources.Excel; this.ExportExcel.Name = "ExportExcel"; - this.ExportExcel.Size = new System.Drawing.Size(188, 36); + this.ExportExcel.Size = new System.Drawing.Size(128, 26); this.ExportExcel.Text = "导出数据"; // // FastRecallDept // this.FastRecallDept.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecallDept.Name = "FastRecallDept"; - this.FastRecallDept.Size = new System.Drawing.Size(188, 36); + this.FastRecallDept.Size = new System.Drawing.Size(128, 26); this.FastRecallDept.Text = "撤回发送"; // // DgvRegItem @@ -795,10 +796,10 @@ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top; this.groupBox2.Font = new System.Drawing.Font("微软雅黑", 9F); this.groupBox2.Location = new System.Drawing.Point(0, 0); - this.groupBox2.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.groupBox2.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); this.groupBox2.Name = "groupBox2"; - this.groupBox2.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.groupBox2.Size = new System.Drawing.Size(464, 324); + this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.groupBox2.Size = new System.Drawing.Size(232, 178); this.groupBox2.TabIndex = 1; this.groupBox2.TabStop = false; this.groupBox2.Text = "快速查询"; @@ -809,20 +810,20 @@ this.TsmiRegRefresh.Appearance.Options.UseFont = true; this.TsmiRegRefresh.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("TsmiRegRefresh.ImageOptions.Image"))); this.TsmiRegRefresh.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; - this.TsmiRegRefresh.Location = new System.Drawing.Point(5, 257); - this.TsmiRegRefresh.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.TsmiRegRefresh.Location = new System.Drawing.Point(2, 141); + this.TsmiRegRefresh.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TsmiRegRefresh.Name = "TsmiRegRefresh"; - this.TsmiRegRefresh.Size = new System.Drawing.Size(454, 62); + this.TsmiRegRefresh.Size = new System.Drawing.Size(227, 34); this.TsmiRegRefresh.TabIndex = 64; this.TsmiRegRefresh.Text = "刷新"; // // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(8, 203); - this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label19.Location = new System.Drawing.Point(4, 111); + this.label19.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(110, 31); + this.label19.Size = new System.Drawing.Size(56, 17); this.label19.TabIndex = 63; this.label19.Text = "终止日期"; // @@ -833,10 +834,10 @@ this.EndDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.EndDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.EndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.EndDate.Location = new System.Drawing.Point(126, 195); - this.EndDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.EndDate.Location = new System.Drawing.Point(63, 107); + this.EndDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.EndDate.Name = "EndDate"; - this.EndDate.Size = new System.Drawing.Size(304, 39); + this.EndDate.Size = new System.Drawing.Size(154, 23); this.EndDate.TabIndex = 62; this.EndDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0); // @@ -848,14 +849,14 @@ this.FastOneMonth, this.FastThreeMonth}); this.DateFastMenu.Name = "DateFastMenu"; - this.DateFastMenu.Size = new System.Drawing.Size(217, 112); + this.DateFastMenu.Size = new System.Drawing.Size(145, 94); // // FastLastWeek // this.FastLastWeek.Image = ((System.Drawing.Image)(resources.GetObject("FastLastWeek.Image"))); this.FastLastWeek.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastLastWeek.Name = "FastLastWeek"; - this.FastLastWeek.Size = new System.Drawing.Size(216, 36); + this.FastLastWeek.Size = new System.Drawing.Size(144, 30); this.FastLastWeek.Text = "最近一周"; // // FastOneMonth @@ -863,7 +864,7 @@ this.FastOneMonth.Image = ((System.Drawing.Image)(resources.GetObject("FastOneMonth.Image"))); this.FastOneMonth.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastOneMonth.Name = "FastOneMonth"; - this.FastOneMonth.Size = new System.Drawing.Size(216, 36); + this.FastOneMonth.Size = new System.Drawing.Size(144, 30); this.FastOneMonth.Text = "最近一个月"; // // FastThreeMonth @@ -871,7 +872,7 @@ this.FastThreeMonth.Image = ((System.Drawing.Image)(resources.GetObject("FastThreeMonth.Image"))); this.FastThreeMonth.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastThreeMonth.Name = "FastThreeMonth"; - this.FastThreeMonth.Size = new System.Drawing.Size(216, 36); + this.FastThreeMonth.Size = new System.Drawing.Size(144, 30); this.FastThreeMonth.Text = "最近三个月"; // // BegDate @@ -881,20 +882,20 @@ this.BegDate.CustomFormat = " yyyy 年 MM 月 dd 日"; this.BegDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BegDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.BegDate.Location = new System.Drawing.Point(126, 127); - this.BegDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.BegDate.Location = new System.Drawing.Point(63, 70); + this.BegDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.BegDate.Name = "BegDate"; - this.BegDate.Size = new System.Drawing.Size(304, 39); + this.BegDate.Size = new System.Drawing.Size(154, 23); this.BegDate.TabIndex = 61; this.BegDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0); // // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(8, 135); - this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label15.Location = new System.Drawing.Point(4, 74); + this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(110, 31); + this.label15.Size = new System.Drawing.Size(56, 17); this.label15.TabIndex = 9; this.label15.Text = "起始日期"; // @@ -902,19 +903,19 @@ // this.NameSearch.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.NameSearch.Font = new System.Drawing.Font("微软雅黑", 9F); - this.NameSearch.Location = new System.Drawing.Point(126, 59); - this.NameSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.NameSearch.Location = new System.Drawing.Point(63, 32); + this.NameSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.NameSearch.Name = "NameSearch"; - this.NameSearch.Size = new System.Drawing.Size(302, 39); + this.NameSearch.Size = new System.Drawing.Size(152, 23); this.NameSearch.TabIndex = 6; // // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(8, 62); - this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.label16.Location = new System.Drawing.Point(4, 34); + this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(110, 31); + this.label16.Size = new System.Drawing.Size(56, 17); this.label16.TabIndex = 5; this.label16.Text = "模糊检索"; // @@ -928,20 +929,20 @@ this.FastCancelCharge, this.FastRefreshCost}); this.CostFastMenu.Name = "CostFastMenu"; - this.CostFastMenu.Size = new System.Drawing.Size(197, 184); + this.CostFastMenu.Size = new System.Drawing.Size(137, 174); // // FastCharge // this.FastCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastCharge.Image"))); this.FastCharge.Name = "FastCharge"; - this.FastCharge.Size = new System.Drawing.Size(196, 36); + this.FastCharge.Size = new System.Drawing.Size(136, 34); this.FastCharge.Text = "记账"; // // FastAllCharge // this.FastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastAllCharge.Image"))); this.FastAllCharge.Name = "FastAllCharge"; - this.FastAllCharge.Size = new System.Drawing.Size(196, 36); + this.FastAllCharge.Size = new System.Drawing.Size(136, 34); this.FastAllCharge.Text = "全部记账"; // // FastDeleteCost @@ -949,7 +950,7 @@ this.FastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("FastDeleteCost.Image"))); this.FastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDeleteCost.Name = "FastDeleteCost"; - this.FastDeleteCost.Size = new System.Drawing.Size(196, 36); + this.FastDeleteCost.Size = new System.Drawing.Size(136, 34); this.FastDeleteCost.Text = "删除订单"; // // FastCancelCharge @@ -957,7 +958,7 @@ this.FastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("FastCancelCharge.Image"))); this.FastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCancelCharge.Name = "FastCancelCharge"; - this.FastCancelCharge.Size = new System.Drawing.Size(196, 36); + this.FastCancelCharge.Size = new System.Drawing.Size(136, 34); this.FastCancelCharge.Text = "取消记账"; // // FastRefreshCost @@ -965,7 +966,7 @@ this.FastRefreshCost.Image = global::PEIS.Properties.Resources.刷新; this.FastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastRefreshCost.Name = "FastRefreshCost"; - this.FastRefreshCost.Size = new System.Drawing.Size(196, 36); + this.FastRefreshCost.Size = new System.Drawing.Size(136, 34); this.FastRefreshCost.Text = "刷新订单"; this.FastRefreshCost.Visible = false; // @@ -973,10 +974,10 @@ // this.splitterControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitterControl1.Appearance.Options.UseBackColor = true; - this.splitterControl1.Location = new System.Drawing.Point(464, 0); - this.splitterControl1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.splitterControl1.Location = new System.Drawing.Point(232, 0); + this.splitterControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitterControl1.Name = "splitterControl1"; - this.splitterControl1.Size = new System.Drawing.Size(10, 1511); + this.splitterControl1.Size = new System.Drawing.Size(5, 779); this.splitterControl1.TabIndex = 16; this.splitterControl1.TabStop = false; // @@ -1205,10 +1206,10 @@ this.TsmiRegAdd, this.TsmiRegEdit, this.TsmiRegCancel}); - this.menuStrip1.Location = new System.Drawing.Point(474, 0); + this.menuStrip1.Location = new System.Drawing.Point(237, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3); - this.menuStrip1.Size = new System.Drawing.Size(2402, 46); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1201, 44); this.menuStrip1.TabIndex = 25; this.menuStrip1.Text = "menuStrip1"; // @@ -1217,7 +1218,7 @@ this.TsmiRegAdd.Image = ((System.Drawing.Image)(resources.GetObject("TsmiRegAdd.Image"))); this.TsmiRegAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiRegAdd.Name = "TsmiRegAdd"; - this.TsmiRegAdd.Size = new System.Drawing.Size(110, 40); + this.TsmiRegAdd.Size = new System.Drawing.Size(80, 40); this.TsmiRegAdd.Text = "登记"; // // TsmiRegEdit @@ -1225,7 +1226,7 @@ this.TsmiRegEdit.Image = ((System.Drawing.Image)(resources.GetObject("TsmiRegEdit.Image"))); this.TsmiRegEdit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiRegEdit.Name = "TsmiRegEdit"; - this.TsmiRegEdit.Size = new System.Drawing.Size(110, 40); + this.TsmiRegEdit.Size = new System.Drawing.Size(80, 40); this.TsmiRegEdit.Text = "编辑"; // // TsmiRegCancel @@ -1233,7 +1234,7 @@ this.TsmiRegCancel.Image = global::PEIS.Properties.Resources.取消2; this.TsmiRegCancel.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiRegCancel.Name = "TsmiRegCancel"; - this.TsmiRegCancel.Size = new System.Drawing.Size(144, 40); + this.TsmiRegCancel.Size = new System.Drawing.Size(90, 40); this.TsmiRegCancel.Text = "取消登记"; // // panel1 @@ -1271,20 +1272,20 @@ this.panel1.Controls.Add(this.ExamTypeLabel); this.panel1.Controls.Add(this.CompanyLabel); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; - this.panel1.Location = new System.Drawing.Point(474, 46); - this.panel1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.panel1.Location = new System.Drawing.Point(237, 44); + this.panel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(2402, 272); + this.panel1.Size = new System.Drawing.Size(1201, 150); this.panel1.TabIndex = 26; // // AgeLabel // this.AgeLabel.AutoSize = true; this.AgeLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.AgeLabel.Location = new System.Drawing.Point(313, 153); + this.AgeLabel.Location = new System.Drawing.Point(156, 84); this.AgeLabel.Margin = new System.Windows.Forms.Padding(0); this.AgeLabel.Name = "AgeLabel"; - this.AgeLabel.Size = new System.Drawing.Size(101, 36); + this.AgeLabel.Size = new System.Drawing.Size(53, 19); this.AgeLabel.TabIndex = 154; this.AgeLabel.Text = "年 龄"; // @@ -1292,10 +1293,10 @@ // this.label18.AutoSize = true; this.label18.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label18.Location = new System.Drawing.Point(232, 157); + this.label18.Location = new System.Drawing.Point(116, 86); this.label18.Margin = new System.Windows.Forms.Padding(0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(82, 31); + this.label18.Size = new System.Drawing.Size(43, 17); this.label18.TabIndex = 153; this.label18.Text = "年 龄:"; // @@ -1303,10 +1304,10 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label17.Location = new System.Drawing.Point(1272, 225); + this.label17.Location = new System.Drawing.Point(636, 123); this.label17.Margin = new System.Windows.Forms.Padding(0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(116, 31); + this.label17.Size = new System.Drawing.Size(59, 17); this.label17.TabIndex = 152; this.label17.Text = "工作单位:"; // @@ -1314,10 +1315,10 @@ // this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label14.Location = new System.Drawing.Point(565, 225); + this.label14.Location = new System.Drawing.Point(282, 123); this.label14.Margin = new System.Windows.Forms.Padding(0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(106, 31); + this.label14.Size = new System.Drawing.Size(55, 17); this.label14.TabIndex = 151; this.label14.Text = "证 件 号:"; // @@ -1325,10 +1326,10 @@ // this.label13.AutoSize = true; this.label13.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label13.Location = new System.Drawing.Point(1272, 157); + this.label13.Location = new System.Drawing.Point(636, 86); this.label13.Margin = new System.Windows.Forms.Padding(0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(130, 31); + this.label13.Size = new System.Drawing.Size(66, 17); this.label13.TabIndex = 150; this.label13.Text = "联系地址1:"; // @@ -1336,10 +1337,10 @@ // this.label12.AutoSize = true; this.label12.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label12.Location = new System.Drawing.Point(1272, 87); + this.label12.Location = new System.Drawing.Point(636, 48); this.label12.Margin = new System.Windows.Forms.Padding(0); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(130, 31); + this.label12.Size = new System.Drawing.Size(66, 17); this.label12.TabIndex = 149; this.label12.Text = "联系电话1:"; // @@ -1347,10 +1348,10 @@ // this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label11.Location = new System.Drawing.Point(1272, 20); + this.label11.Location = new System.Drawing.Point(636, 11); this.label11.Margin = new System.Windows.Forms.Padding(0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(106, 31); + this.label11.Size = new System.Drawing.Size(54, 17); this.label11.TabIndex = 148; this.label11.Text = "联系人1:"; // @@ -1358,10 +1359,10 @@ // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label10.Location = new System.Drawing.Point(932, 157); + this.label10.Location = new System.Drawing.Point(466, 86); this.label10.Margin = new System.Windows.Forms.Padding(0); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(116, 31); + this.label10.Size = new System.Drawing.Size(59, 17); this.label10.TabIndex = 147; this.label10.Text = "教育程度:"; // @@ -1369,10 +1370,10 @@ // this.label9.AutoSize = true; this.label9.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label9.Location = new System.Drawing.Point(565, 157); + this.label9.Location = new System.Drawing.Point(282, 86); this.label9.Margin = new System.Windows.Forms.Padding(0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(116, 31); + this.label9.Size = new System.Drawing.Size(59, 17); this.label9.TabIndex = 146; this.label9.Text = "婚姻状况:"; // @@ -1380,10 +1381,10 @@ // this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label8.Location = new System.Drawing.Point(932, 87); + this.label8.Location = new System.Drawing.Point(466, 48); this.label8.Margin = new System.Windows.Forms.Padding(0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(82, 31); + this.label8.Size = new System.Drawing.Size(43, 17); this.label8.TabIndex = 145; this.label8.Text = "职 业:"; // @@ -1391,10 +1392,10 @@ // this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label7.Location = new System.Drawing.Point(565, 87); + this.label7.Location = new System.Drawing.Point(282, 48); this.label7.Margin = new System.Windows.Forms.Padding(0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(116, 31); + this.label7.Size = new System.Drawing.Size(59, 17); this.label7.TabIndex = 144; this.label7.Text = "体检类型:"; // @@ -1402,10 +1403,10 @@ // this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label6.Location = new System.Drawing.Point(565, 20); + this.label6.Location = new System.Drawing.Point(282, 11); this.label6.Margin = new System.Windows.Forms.Padding(0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(116, 31); + this.label6.Size = new System.Drawing.Size(59, 17); this.label6.TabIndex = 143; this.label6.Text = "体检日期:"; // @@ -1413,10 +1414,10 @@ // this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label5.Location = new System.Drawing.Point(232, 225); + this.label5.Location = new System.Drawing.Point(116, 123); this.label5.Margin = new System.Windows.Forms.Padding(0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(116, 31); + this.label5.Size = new System.Drawing.Size(59, 17); this.label5.TabIndex = 142; this.label5.Text = "出生日期:"; // @@ -1424,30 +1425,30 @@ // this.label4.AutoSize = true; this.label4.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label4.Location = new System.Drawing.Point(932, 20); + this.label4.Location = new System.Drawing.Point(466, 11); this.label4.Margin = new System.Windows.Forms.Padding(0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(82, 31); + this.label4.Size = new System.Drawing.Size(43, 17); this.label4.TabIndex = 141; this.label4.Text = "民 族:"; // // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(232, 87); + this.label3.Location = new System.Drawing.Point(116, 48); this.label3.Margin = new System.Windows.Forms.Padding(0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(82, 31); + this.label3.Size = new System.Drawing.Size(43, 17); this.label3.TabIndex = 140; this.label3.Text = "性 别:"; // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(232, 20); + this.label2.Location = new System.Drawing.Point(116, 11); this.label2.Margin = new System.Windows.Forms.Padding(0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(82, 31); + this.label2.Size = new System.Drawing.Size(43, 17); this.label2.TabIndex = 139; this.label2.Text = "姓 名:"; // @@ -1455,10 +1456,10 @@ // this.ContractorLabel1.AutoSize = true; this.ContractorLabel1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.ContractorLabel1.Location = new System.Drawing.Point(1377, 20); + this.ContractorLabel1.Location = new System.Drawing.Point(688, 11); this.ContractorLabel1.Margin = new System.Windows.Forms.Padding(0); this.ContractorLabel1.Name = "ContractorLabel1"; - this.ContractorLabel1.Size = new System.Drawing.Size(100, 31); + this.ContractorLabel1.Size = new System.Drawing.Size(51, 17); this.ContractorLabel1.TabIndex = 138; this.ContractorLabel1.Text = "联系人1"; // @@ -1466,10 +1467,10 @@ // this.AddressLabel1.AutoSize = true; this.AddressLabel1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.AddressLabel1.Location = new System.Drawing.Point(1400, 157); + this.AddressLabel1.Location = new System.Drawing.Point(700, 86); this.AddressLabel1.Margin = new System.Windows.Forms.Padding(0); this.AddressLabel1.Name = "AddressLabel1"; - this.AddressLabel1.Size = new System.Drawing.Size(124, 31); + this.AddressLabel1.Size = new System.Drawing.Size(63, 17); this.AddressLabel1.TabIndex = 137; this.AddressLabel1.Text = "联系地址1"; // @@ -1477,20 +1478,20 @@ // this.SexLabel.AutoSize = true; this.SexLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.SexLabel.Location = new System.Drawing.Point(313, 85); + this.SexLabel.Location = new System.Drawing.Point(156, 47); this.SexLabel.Margin = new System.Windows.Forms.Padding(0); this.SexLabel.Name = "SexLabel"; - this.SexLabel.Size = new System.Drawing.Size(101, 36); + this.SexLabel.Size = new System.Drawing.Size(53, 19); this.SexLabel.TabIndex = 136; this.SexLabel.Text = "性 别"; // // RegAvatar // this.RegAvatar.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.RegAvatar.Location = new System.Drawing.Point(8, 6); - this.RegAvatar.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.RegAvatar.Location = new System.Drawing.Point(4, 3); + this.RegAvatar.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.RegAvatar.Name = "RegAvatar"; - this.RegAvatar.Size = new System.Drawing.Size(206, 248); + this.RegAvatar.Size = new System.Drawing.Size(104, 137); this.RegAvatar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.RegAvatar.TabIndex = 135; this.RegAvatar.TabStop = false; @@ -1499,10 +1500,10 @@ // this.BirthdayLabel.AutoSize = true; this.BirthdayLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.BirthdayLabel.Location = new System.Drawing.Point(348, 223); + this.BirthdayLabel.Location = new System.Drawing.Point(174, 122); this.BirthdayLabel.Margin = new System.Windows.Forms.Padding(0); this.BirthdayLabel.Name = "BirthdayLabel"; - this.BirthdayLabel.Size = new System.Drawing.Size(175, 36); + this.BirthdayLabel.Size = new System.Drawing.Size(93, 19); this.BirthdayLabel.TabIndex = 128; this.BirthdayLabel.Text = "2000-01-01"; // @@ -1510,10 +1511,10 @@ // this.NationLabel.AutoSize = true; this.NationLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.NationLabel.Location = new System.Drawing.Point(1013, 20); + this.NationLabel.Location = new System.Drawing.Point(506, 11); this.NationLabel.Margin = new System.Windows.Forms.Padding(0); this.NationLabel.Name = "NationLabel"; - this.NationLabel.Size = new System.Drawing.Size(90, 31); + this.NationLabel.Size = new System.Drawing.Size(48, 17); this.NationLabel.TabIndex = 127; this.NationLabel.Text = "民 族"; // @@ -1521,10 +1522,10 @@ // this.NameLabel.AutoSize = true; this.NameLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.NameLabel.Location = new System.Drawing.Point(313, 17); + this.NameLabel.Location = new System.Drawing.Point(156, 9); this.NameLabel.Margin = new System.Windows.Forms.Padding(0); this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(101, 36); + this.NameLabel.Size = new System.Drawing.Size(53, 19); this.NameLabel.TabIndex = 129; this.NameLabel.Text = "姓 名"; // @@ -1532,10 +1533,10 @@ // this.EducationLabel.AutoSize = true; this.EducationLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.EducationLabel.Location = new System.Drawing.Point(1044, 157); + this.EducationLabel.Location = new System.Drawing.Point(522, 86); this.EducationLabel.Margin = new System.Windows.Forms.Padding(0); this.EducationLabel.Name = "EducationLabel"; - this.EducationLabel.Size = new System.Drawing.Size(110, 31); + this.EducationLabel.Size = new System.Drawing.Size(56, 17); this.EducationLabel.TabIndex = 125; this.EducationLabel.Text = "教育程度"; // @@ -1543,10 +1544,10 @@ // this.ExamDateLabel.AutoSize = true; this.ExamDateLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.ExamDateLabel.Location = new System.Drawing.Point(677, 17); + this.ExamDateLabel.Location = new System.Drawing.Point(338, 9); this.ExamDateLabel.Margin = new System.Windows.Forms.Padding(0); this.ExamDateLabel.Name = "ExamDateLabel"; - this.ExamDateLabel.Size = new System.Drawing.Size(175, 36); + this.ExamDateLabel.Size = new System.Drawing.Size(93, 19); this.ExamDateLabel.TabIndex = 132; this.ExamDateLabel.Text = "2000-01-01"; // @@ -1554,10 +1555,10 @@ // this.TelLabel1.AutoSize = true; this.TelLabel1.Font = new System.Drawing.Font("微软雅黑", 9F); - this.TelLabel1.Location = new System.Drawing.Point(1400, 87); + this.TelLabel1.Location = new System.Drawing.Point(700, 48); this.TelLabel1.Margin = new System.Windows.Forms.Padding(0); this.TelLabel1.Name = "TelLabel1"; - this.TelLabel1.Size = new System.Drawing.Size(124, 31); + this.TelLabel1.Size = new System.Drawing.Size(63, 17); this.TelLabel1.TabIndex = 134; this.TelLabel1.Text = "联系电话1"; // @@ -1565,10 +1566,10 @@ // this.MaritalLabel.AutoSize = true; this.MaritalLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.MaritalLabel.Location = new System.Drawing.Point(677, 153); + this.MaritalLabel.Location = new System.Drawing.Point(338, 84); this.MaritalLabel.Margin = new System.Windows.Forms.Padding(0); this.MaritalLabel.Name = "MaritalLabel"; - this.MaritalLabel.Size = new System.Drawing.Size(123, 36); + this.MaritalLabel.Size = new System.Drawing.Size(65, 19); this.MaritalLabel.TabIndex = 126; this.MaritalLabel.Text = "婚姻状况"; // @@ -1576,10 +1577,10 @@ // this.CardNoLabel.AutoSize = true; this.CardNoLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.CardNoLabel.Location = new System.Drawing.Point(670, 225); + this.CardNoLabel.Location = new System.Drawing.Point(335, 123); this.CardNoLabel.Margin = new System.Windows.Forms.Padding(0); this.CardNoLabel.Name = "CardNoLabel"; - this.CardNoLabel.Size = new System.Drawing.Size(96, 36); + this.CardNoLabel.Size = new System.Drawing.Size(51, 19); this.CardNoLabel.TabIndex = 131; this.CardNoLabel.Text = "证件号"; // @@ -1587,10 +1588,10 @@ // this.OccupationLabel.AutoSize = true; this.OccupationLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.OccupationLabel.Location = new System.Drawing.Point(1013, 87); + this.OccupationLabel.Location = new System.Drawing.Point(506, 48); this.OccupationLabel.Margin = new System.Windows.Forms.Padding(0); this.OccupationLabel.Name = "OccupationLabel"; - this.OccupationLabel.Size = new System.Drawing.Size(90, 31); + this.OccupationLabel.Size = new System.Drawing.Size(48, 17); this.OccupationLabel.TabIndex = 124; this.OccupationLabel.Text = "职 业"; // @@ -1598,10 +1599,10 @@ // this.ExamTypeLabel.AutoSize = true; this.ExamTypeLabel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Bold); - this.ExamTypeLabel.Location = new System.Drawing.Point(677, 85); + this.ExamTypeLabel.Location = new System.Drawing.Point(338, 47); this.ExamTypeLabel.Margin = new System.Windows.Forms.Padding(0); this.ExamTypeLabel.Name = "ExamTypeLabel"; - this.ExamTypeLabel.Size = new System.Drawing.Size(123, 36); + this.ExamTypeLabel.Size = new System.Drawing.Size(65, 19); this.ExamTypeLabel.TabIndex = 133; this.ExamTypeLabel.Text = "体检类型"; // @@ -1609,10 +1610,10 @@ // this.CompanyLabel.AutoSize = true; this.CompanyLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.CompanyLabel.Location = new System.Drawing.Point(1386, 225); + this.CompanyLabel.Location = new System.Drawing.Point(693, 123); this.CompanyLabel.Margin = new System.Windows.Forms.Padding(0); this.CompanyLabel.Name = "CompanyLabel"; - this.CompanyLabel.Size = new System.Drawing.Size(110, 31); + this.CompanyLabel.Size = new System.Drawing.Size(56, 17); this.CompanyLabel.TabIndex = 130; this.CompanyLabel.Text = "工作单位"; // @@ -1662,10 +1663,10 @@ this.TsmiProjectPrintGuide, this.TsmiProjectPrintApply, this.TsmiOpenFeeItem}); - this.ProjectMenu.Location = new System.Drawing.Point(474, 318); + this.ProjectMenu.Location = new System.Drawing.Point(237, 194); this.ProjectMenu.Name = "ProjectMenu"; - this.ProjectMenu.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3); - this.ProjectMenu.Size = new System.Drawing.Size(2402, 46); + this.ProjectMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.ProjectMenu.Size = new System.Drawing.Size(1201, 44); this.ProjectMenu.TabIndex = 28; this.ProjectMenu.Text = "menuStrip1"; // @@ -1674,7 +1675,7 @@ this.TsmiPojectCreateOrder.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPojectCreateOrder.Image"))); this.TsmiPojectCreateOrder.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPojectCreateOrder.Name = "TsmiPojectCreateOrder"; - this.TsmiPojectCreateOrder.Size = new System.Drawing.Size(158, 40); + this.TsmiPojectCreateOrder.Size = new System.Drawing.Size(104, 40); this.TsmiPojectCreateOrder.Text = "个人收费"; // // TsmiProjectPrintCost @@ -1682,7 +1683,7 @@ this.TsmiProjectPrintCost.Image = ((System.Drawing.Image)(resources.GetObject("TsmiProjectPrintCost.Image"))); this.TsmiProjectPrintCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiProjectPrintCost.Name = "TsmiProjectPrintCost"; - this.TsmiProjectPrintCost.Size = new System.Drawing.Size(182, 40); + this.TsmiProjectPrintCost.Size = new System.Drawing.Size(116, 40); this.TsmiProjectPrintCost.Text = "打印收费单"; // // TsmiProjectCharge @@ -1690,7 +1691,7 @@ this.TsmiProjectCharge.Image = ((System.Drawing.Image)(resources.GetObject("TsmiProjectCharge.Image"))); this.TsmiProjectCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiProjectCharge.Name = "TsmiProjectCharge"; - this.TsmiProjectCharge.Size = new System.Drawing.Size(124, 40); + this.TsmiProjectCharge.Size = new System.Drawing.Size(88, 40); this.TsmiProjectCharge.Text = "记 账"; this.TsmiProjectCharge.Visible = false; // @@ -1699,7 +1700,7 @@ this.TsmiProjectSendDept.Image = ((System.Drawing.Image)(resources.GetObject("TsmiProjectSendDept.Image"))); this.TsmiProjectSendDept.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiProjectSendDept.Name = "TsmiProjectSendDept"; - this.TsmiProjectSendDept.Size = new System.Drawing.Size(178, 40); + this.TsmiProjectSendDept.Size = new System.Drawing.Size(112, 40); this.TsmiProjectSendDept.Text = "发送到科室"; // // TsmiProjectPrintGuide @@ -1707,7 +1708,7 @@ this.TsmiProjectPrintGuide.Image = ((System.Drawing.Image)(resources.GetObject("TsmiProjectPrintGuide.Image"))); this.TsmiProjectPrintGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiProjectPrintGuide.Name = "TsmiProjectPrintGuide"; - this.TsmiProjectPrintGuide.Size = new System.Drawing.Size(182, 40); + this.TsmiProjectPrintGuide.Size = new System.Drawing.Size(116, 40); this.TsmiProjectPrintGuide.Text = "打印导检单"; // // TsmiProjectPrintApply @@ -1715,7 +1716,7 @@ this.TsmiProjectPrintApply.Image = ((System.Drawing.Image)(resources.GetObject("TsmiProjectPrintApply.Image"))); this.TsmiProjectPrintApply.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiProjectPrintApply.Name = "TsmiProjectPrintApply"; - this.TsmiProjectPrintApply.Size = new System.Drawing.Size(182, 40); + this.TsmiProjectPrintApply.Size = new System.Drawing.Size(116, 40); this.TsmiProjectPrintApply.Text = "打印申请单"; this.TsmiProjectPrintApply.Visible = false; // @@ -1724,7 +1725,7 @@ this.TsmiOpenFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiOpenFeeItem.Image"))); this.TsmiOpenFeeItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOpenFeeItem.Name = "TsmiOpenFeeItem"; - this.TsmiOpenFeeItem.Size = new System.Drawing.Size(198, 40); + this.TsmiOpenFeeItem.Size = new System.Drawing.Size(120, 40); this.TsmiOpenFeeItem.Text = "关闭收费项目"; // // gridView11 @@ -1772,8 +1773,8 @@ this.splitContainer1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202))))); this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer1.Location = new System.Drawing.Point(474, 364); - this.splitContainer1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.splitContainer1.Location = new System.Drawing.Point(237, 238); + this.splitContainer1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -1784,9 +1785,9 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.DgcCheckCost); - this.splitContainer1.Size = new System.Drawing.Size(2402, 1147); - this.splitContainer1.SplitterDistance = 622; - this.splitContainer1.SplitterWidth = 6; + this.splitContainer1.Size = new System.Drawing.Size(1201, 541); + this.splitContainer1.SplitterDistance = 293; + this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 29; // // splitContainer2 @@ -1795,7 +1796,7 @@ this.splitContainer2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.splitContainer2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.splitContainer2.Name = "splitContainer2"; // // splitContainer2.Panel1 @@ -1806,20 +1807,20 @@ // this.splitContainer2.Panel2.BackColor = System.Drawing.Color.White; this.splitContainer2.Panel2.Controls.Add(this.PackAndFeeItem); - this.splitContainer2.Size = new System.Drawing.Size(2402, 622); - this.splitContainer2.SplitterDistance = 699; - this.splitContainer2.SplitterWidth = 6; + this.splitContainer2.Size = new System.Drawing.Size(1201, 293); + this.splitContainer2.SplitterDistance = 547; + this.splitContainer2.SplitterWidth = 3; this.splitContainer2.TabIndex = 0; // // DgcEFeeItem // this.DgcEFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcEFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcEFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcEFeeItem.Location = new System.Drawing.Point(0, 0); this.DgcEFeeItem.MainView = this.DgvEFeeItem; - this.DgcEFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcEFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcEFeeItem.Name = "DgcEFeeItem"; - this.DgcEFeeItem.Size = new System.Drawing.Size(695, 618); + this.DgcEFeeItem.Size = new System.Drawing.Size(543, 289); this.DgcEFeeItem.TabIndex = 2; this.DgcEFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvEFeeItem}); @@ -1855,7 +1856,7 @@ // // gridColumn28 // - this.gridColumn28.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn28.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn28.AppearanceCell.Options.UseFont = true; this.gridColumn28.Caption = "订单号"; this.gridColumn28.FieldName = "OrderNo"; @@ -1873,7 +1874,7 @@ // // gridColumn21 // - this.gridColumn21.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn21.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn21.AppearanceCell.Options.UseFont = true; this.gridColumn21.Caption = "套餐"; this.gridColumn21.FieldName = "PackName"; @@ -1891,7 +1892,7 @@ // // gridColumn22 // - this.gridColumn22.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn22.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn22.AppearanceCell.Options.UseFont = true; this.gridColumn22.Caption = "收费项目"; this.gridColumn22.FieldName = "FeeItemName"; @@ -1909,7 +1910,7 @@ // // gridColumn23 // - this.gridColumn23.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn23.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn23.AppearanceCell.Options.UseFont = true; this.gridColumn23.Caption = "收费价格"; this.gridColumn23.FieldName = "Price"; @@ -1928,7 +1929,7 @@ // // gridColumn25 // - this.gridColumn25.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn25.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn25.AppearanceCell.Options.UseFont = true; this.gridColumn25.Caption = "核算价格"; this.gridColumn25.FieldName = "SettlePrice"; @@ -1947,7 +1948,7 @@ // // gridColumn29 // - this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn29.AppearanceCell.Options.UseFont = true; this.gridColumn29.Caption = "执行科室"; this.gridColumn29.FieldName = "DeptName"; @@ -1964,7 +1965,7 @@ // // gridColumn30 // - this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn30.AppearanceCell.Options.UseFont = true; this.gridColumn30.Caption = "数量"; this.gridColumn30.FieldName = "Quantity"; @@ -1982,7 +1983,7 @@ // // gridColumn31 // - this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn31.AppearanceCell.Options.UseFont = true; this.gridColumn31.Caption = "单位"; this.gridColumn31.FieldName = "Unit"; @@ -2000,7 +2001,7 @@ // // gridColumn32 // - this.gridColumn32.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 11F); + this.gridColumn32.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn32.AppearanceCell.Options.UseFont = true; this.gridColumn32.Caption = "检查类别"; this.gridColumn32.FieldName = "ItemClass"; @@ -2022,35 +2023,33 @@ this.PackAndFeeItem.Controls.Add(this.CopyItemTab); this.PackAndFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; this.PackAndFeeItem.Location = new System.Drawing.Point(0, 0); - this.PackAndFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.PackAndFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.PackAndFeeItem.Name = "PackAndFeeItem"; this.PackAndFeeItem.SelectedIndex = 0; - this.PackAndFeeItem.Size = new System.Drawing.Size(1693, 618); + this.PackAndFeeItem.Size = new System.Drawing.Size(647, 289); this.PackAndFeeItem.TabIndex = 1; // // ExamComboTab // this.ExamComboTab.BackColor = System.Drawing.Color.White; this.ExamComboTab.Controls.Add(this.DgcPack); - this.ExamComboTab.Location = new System.Drawing.Point(8, 45); - this.ExamComboTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.ExamComboTab.Location = new System.Drawing.Point(4, 26); + this.ExamComboTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ExamComboTab.Name = "ExamComboTab"; - this.ExamComboTab.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.ExamComboTab.Size = new System.Drawing.Size(1677, 565); + this.ExamComboTab.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.ExamComboTab.Size = new System.Drawing.Size(639, 259); this.ExamComboTab.TabIndex = 1; this.ExamComboTab.Text = "体检套餐"; // // DgcPack // this.DgcPack.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPack.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcPack.Location = new System.Drawing.Point(5, 6); + this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; - this.DgcPack.Margin = new System.Windows.Forms.Padding(6); this.DgcPack.Name = "DgcPack"; this.DgcPack.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcPack.Size = new System.Drawing.Size(1667, 553); + this.DgcPack.Size = new System.Drawing.Size(635, 253); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2210,25 +2209,23 @@ this.FeeItemTab.BackColor = System.Drawing.Color.White; this.FeeItemTab.Controls.Add(this.DgcFeeItem); this.FeeItemTab.Controls.Add(this.FeeItemSearch); - this.FeeItemTab.Location = new System.Drawing.Point(8, 45); - this.FeeItemTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.FeeItemTab.Location = new System.Drawing.Point(4, 26); + this.FeeItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.FeeItemTab.Name = "FeeItemTab"; - this.FeeItemTab.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.FeeItemTab.Size = new System.Drawing.Size(1675, 561); + this.FeeItemTab.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.FeeItemTab.Size = new System.Drawing.Size(637, 255); this.FeeItemTab.TabIndex = 0; this.FeeItemTab.Text = "收费项目"; // // DgcFeeItem // this.DgcFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); - this.DgcFeeItem.Location = new System.Drawing.Point(5, 45); + this.DgcFeeItem.Location = new System.Drawing.Point(2, 26); this.DgcFeeItem.MainView = this.DgvFeeItem; - this.DgcFeeItem.Margin = new System.Windows.Forms.Padding(6); this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(1665, 510); + this.DgcFeeItem.Size = new System.Drawing.Size(633, 226); this.DgcFeeItem.TabIndex = 124; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -2397,21 +2394,21 @@ // FeeItemSearch // this.FeeItemSearch.Dock = System.Windows.Forms.DockStyle.Top; - this.FeeItemSearch.Location = new System.Drawing.Point(5, 6); - this.FeeItemSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.FeeItemSearch.Location = new System.Drawing.Point(2, 3); + this.FeeItemSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.FeeItemSearch.Name = "FeeItemSearch"; - this.FeeItemSearch.Size = new System.Drawing.Size(1665, 39); + this.FeeItemSearch.Size = new System.Drawing.Size(633, 23); this.FeeItemSearch.TabIndex = 123; // // CopyItemTab // this.CopyItemTab.Controls.Add(this.DgcCopyItem); - this.CopyItemTab.Controls.Add(this.DgcRegItem2); + this.CopyItemTab.Controls.Add(this.panel2); this.CopyItemTab.Controls.Add(this.CopyMenu); - this.CopyItemTab.Location = new System.Drawing.Point(8, 45); - this.CopyItemTab.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.CopyItemTab.Location = new System.Drawing.Point(4, 26); + this.CopyItemTab.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.CopyItemTab.Name = "CopyItemTab"; - this.CopyItemTab.Size = new System.Drawing.Size(1675, 561); + this.CopyItemTab.Size = new System.Drawing.Size(639, 259); this.CopyItemTab.TabIndex = 2; this.CopyItemTab.Text = "从体检者复制项目"; this.CopyItemTab.UseVisualStyleBackColor = true; @@ -2419,13 +2416,13 @@ // DgcCopyItem // this.DgcCopyItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcCopyItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.DgcCopyItem.Location = new System.Drawing.Point(287, 41); + this.DgcCopyItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.DgcCopyItem.Location = new System.Drawing.Point(140, 28); this.DgcCopyItem.MainView = this.DgvCopyItem; - this.DgcCopyItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcCopyItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcCopyItem.Name = "DgcCopyItem"; - this.DgcCopyItem.Size = new System.Drawing.Size(1388, 520); - this.DgcCopyItem.TabIndex = 30; + this.DgcCopyItem.Size = new System.Drawing.Size(499, 231); + this.DgcCopyItem.TabIndex = 32; this.DgcCopyItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvCopyItem}); // @@ -2458,7 +2455,7 @@ // // gridColumn42 // - this.gridColumn42.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn42.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn42.AppearanceCell.Options.UseFont = true; this.gridColumn42.Caption = "套餐"; this.gridColumn42.FieldName = "PackName"; @@ -2476,7 +2473,7 @@ // // gridColumn43 // - this.gridColumn43.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn43.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn43.AppearanceCell.Options.UseFont = true; this.gridColumn43.Caption = "收费项目"; this.gridColumn43.FieldName = "FeeItemName"; @@ -2492,7 +2489,7 @@ // // gridColumn44 // - this.gridColumn44.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn44.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn44.AppearanceCell.Options.UseFont = true; this.gridColumn44.Caption = "收费价格"; this.gridColumn44.FieldName = "Price"; @@ -2509,7 +2506,7 @@ // // gridColumn45 // - this.gridColumn45.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn45.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn45.AppearanceCell.Options.UseFont = true; this.gridColumn45.Caption = "核算价格"; this.gridColumn45.FieldName = "SettlePrice"; @@ -2526,7 +2523,7 @@ // // gridColumn46 // - this.gridColumn46.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn46.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn46.AppearanceCell.Options.UseFont = true; this.gridColumn46.Caption = "执行科室"; this.gridColumn46.FieldName = "DeptName"; @@ -2543,7 +2540,7 @@ // // gridColumn47 // - this.gridColumn47.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn47.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn47.AppearanceCell.Options.UseFont = true; this.gridColumn47.Caption = "数量"; this.gridColumn47.FieldName = "Quantity"; @@ -2561,7 +2558,7 @@ // // gridColumn48 // - this.gridColumn48.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn48.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn48.AppearanceCell.Options.UseFont = true; this.gridColumn48.Caption = "单位"; this.gridColumn48.FieldName = "Unit"; @@ -2579,7 +2576,7 @@ // // gridColumn49 // - this.gridColumn49.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F); + this.gridColumn49.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn49.AppearanceCell.Options.UseFont = true; this.gridColumn49.Caption = "检查类别"; this.gridColumn49.FieldName = "ItemClass"; @@ -2594,15 +2591,36 @@ this.gridColumn49.Visible = true; this.gridColumn49.VisibleIndex = 7; // + // panel2 + // + this.panel2.Controls.Add(this.NameSearch2); + this.panel2.Controls.Add(this.DgcRegItem2); + this.panel2.Dock = System.Windows.Forms.DockStyle.Left; + this.panel2.Location = new System.Drawing.Point(0, 28); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(140, 231); + this.panel2.TabIndex = 31; + // + // NameSearch2 + // + this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top; + this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F); + this.NameSearch2.Location = new System.Drawing.Point(0, 0); + this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.NameSearch2.Name = "NameSearch2"; + this.NameSearch2.Size = new System.Drawing.Size(140, 23); + this.NameSearch2.TabIndex = 30; + // // DgcRegItem2 // - this.DgcRegItem2.Dock = System.Windows.Forms.DockStyle.Left; - this.DgcRegItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.DgcRegItem2.Location = new System.Drawing.Point(0, 41); + this.DgcRegItem2.Dock = System.Windows.Forms.DockStyle.Fill; + this.DgcRegItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.DgcRegItem2.Location = new System.Drawing.Point(0, 0); this.DgcRegItem2.MainView = this.DgvRegItem2; - this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcRegItem2.Name = "DgcRegItem2"; - this.DgcRegItem2.Size = new System.Drawing.Size(287, 520); + this.DgcRegItem2.Size = new System.Drawing.Size(140, 231); this.DgcRegItem2.TabIndex = 29; this.DgcRegItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRegItem2}); @@ -2625,15 +2643,22 @@ // // gridColumn50 // + this.gridColumn50.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn50.AppearanceCell.Options.UseFont = true; this.gridColumn50.Caption = "体检号"; this.gridColumn50.FieldName = "ID"; this.gridColumn50.Name = "gridColumn50"; + this.gridColumn50.OptionsColumn.AllowEdit = false; + this.gridColumn50.OptionsColumn.ReadOnly = true; + this.gridColumn50.OptionsFilter.AllowFilter = false; this.gridColumn50.Visible = true; this.gridColumn50.VisibleIndex = 0; this.gridColumn50.Width = 55; // // gridColumn9 // + this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn9.AppearanceCell.Options.UseFont = true; this.gridColumn9.Caption = "姓名"; this.gridColumn9.FieldName = "Name"; this.gridColumn9.Name = "gridColumn9"; @@ -2658,8 +2683,8 @@ this.TsmiCopyFeeItem}); this.CopyMenu.Location = new System.Drawing.Point(0, 0); this.CopyMenu.Name = "CopyMenu"; - this.CopyMenu.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3); - this.CopyMenu.Size = new System.Drawing.Size(1675, 41); + this.CopyMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.CopyMenu.Size = new System.Drawing.Size(639, 28); this.CopyMenu.TabIndex = 24; this.CopyMenu.Text = "menuStrip1"; // @@ -2667,21 +2692,19 @@ // this.TsmiCopyFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCopyFeeItem.Image"))); this.TsmiCopyFeeItem.Name = "TsmiCopyFeeItem"; - this.TsmiCopyFeeItem.Size = new System.Drawing.Size(94, 35); + this.TsmiCopyFeeItem.Size = new System.Drawing.Size(64, 24); this.TsmiCopyFeeItem.Text = "复制"; // // DgcCheckCost // this.DgcCheckCost.ContextMenuStrip = this.CostFastMenu; this.DgcCheckCost.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcCheckCost.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost.Location = new System.Drawing.Point(0, 0); this.DgcCheckCost.MainView = this.DgvCheckCost; - this.DgcCheckCost.Margin = new System.Windows.Forms.Padding(6); this.DgcCheckCost.Name = "DgcCheckCost"; this.DgcCheckCost.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcCheckCost.Size = new System.Drawing.Size(2398, 515); + this.DgcCheckCost.Size = new System.Drawing.Size(1197, 241); this.DgcCheckCost.TabIndex = 145; this.DgcCheckCost.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvCheckCost}); @@ -2736,13 +2759,6 @@ this.DgvCheckCost.OptionsView.ShowIndicator = false; this.DgvCheckCost.RowHeight = 35; // - // repositoryItemMemoEdit3 - // - this.repositoryItemMemoEdit3.Appearance.Options.UseTextOptions = true; - this.repositoryItemMemoEdit3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.repositoryItemMemoEdit3.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; - this.repositoryItemMemoEdit3.Name = "repositoryItemMemoEdit3"; - // // gridColumn53 // this.gridColumn53.Caption = "退费人"; @@ -2759,19 +2775,26 @@ this.gridColumn53.Visible = true; this.gridColumn53.VisibleIndex = 14; // + // repositoryItemMemoEdit3 + // + this.repositoryItemMemoEdit3.Appearance.Options.UseTextOptions = true; + this.repositoryItemMemoEdit3.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; + this.repositoryItemMemoEdit3.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.repositoryItemMemoEdit3.Name = "repositoryItemMemoEdit3"; + // // EnrollmentPersonForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(2876, 1511); + this.ClientSize = new System.Drawing.Size(1438, 779); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.ProjectMenu); this.Controls.Add(this.panel1); this.Controls.Add(this.menuStrip1); this.Controls.Add(this.splitterControl1); this.Controls.Add(this.RegListPanel); - this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "EnrollmentPersonForm"; this.Text = "个人登记"; this.Load += new System.EventHandler(this.Reg4PersonForm_Load); @@ -2834,6 +2857,8 @@ this.CopyItemTab.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcCopyItem)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvCopyItem)).EndInit(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcRegItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvRegItem2)).EndInit(); this.CopyMenu.ResumeLayout(false); @@ -2996,16 +3021,6 @@ private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private System.Windows.Forms.TextBox FeeItemSearch; private System.Windows.Forms.TabPage CopyItemTab; - private DevExpress.XtraGrid.GridControl DgcCopyItem; - private DevExpress.XtraGrid.Views.Grid.GridView DgvCopyItem; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn43; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn44; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn45; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn46; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn49; private DevExpress.XtraGrid.GridControl DgcRegItem2; private DevExpress.XtraGrid.Views.Grid.GridView DgvRegItem2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn50; @@ -3048,5 +3063,17 @@ private System.Windows.Forms.ToolStripMenuItem FastRefreshCost; private DevExpress.XtraGrid.Columns.GridColumn gridColumn52; private DevExpress.XtraGrid.Columns.GridColumn gridColumn53; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.TextBox NameSearch2; + private DevExpress.XtraGrid.GridControl DgcCopyItem; + private DevExpress.XtraGrid.Views.Grid.GridView DgvCopyItem; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn43; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn44; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn45; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn46; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn49; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index a86fa90..6a91cbe 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -23,7 +23,7 @@ namespace PEIS.View.Enrollment public partial class EnrollmentPersonForm : ViewBase, IEnrollmentPersonView { List _lstPack = null; - List _lstRegItems = null; + List _lstRegItems = null, _lstRegItems2 = null; List _lstEFeeItem = null, _lstCopyFeeItem = null; List _lstCheckCost = null; List _lstFeeItem = null, _lstPackFeeItem = null; @@ -137,6 +137,7 @@ namespace PEIS.View.Enrollment DgvCopyItem.CustomColumnDisplayText += DgvCopyItem_CustomColumnDisplayText; DgvRegItem2.SelectionChanged += DgvRegItem2_SelectionChanged; + NameSearch2.KeyDown += NameSearch2_KeyDown; #region 判断双击位置 DgvPack.MouseDown += DgvPack_MouseDown; @@ -145,7 +146,6 @@ namespace PEIS.View.Enrollment #endregion } - private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e) { eInfo = DgvEFeeItem.CalcHitInfo(e.X, e.Y); @@ -223,7 +223,7 @@ namespace PEIS.View.Enrollment ThreadPool.QueueUserWorkItem(state => { - OnGetRegItems(); + OnGetRegItems(0); OnGetPackItem(); // 获取体检套餐 OnGetFeeItem(); // 获取收费项目 }); @@ -235,14 +235,14 @@ namespace PEIS.View.Enrollment private void NameSearch_KeyDown(object sender, KeyEventArgs e) // 模糊检索 { - if (e.KeyCode == Keys.Enter) OnGetRegItems(); + if (e.KeyCode == Keys.Enter) OnGetRegItems(0); } private void TsmiRegRefresh_Click(object sender, EventArgs e) // 刷新按钮 { // 使当前控件获得焦点，避免日期选择器修改后未生效 menuStrip1.Focus(); - OnGetRegItems(); + OnGetRegItems(0); } private void DgvRegItem_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 登记列表切换 @@ -303,7 +303,7 @@ namespace PEIS.View.Enrollment { NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(null, false); enrollmentPersonForm.ShowDialog(); - OnGetRegItems(); + OnGetRegItems(0); } private void TsmiRegEdit_Click(object sender, EventArgs e) // 编辑登记信息 @@ -311,7 +311,7 @@ namespace PEIS.View.Enrollment if (_lstRegItems == null || _lstRegItems.Count() == 0) return; NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true); enrollmentPersonForm.ShowDialog(); - OnGetRegItems(); + OnGetRegItems(0); } private void TsmiRegCancel_Click(object sender, EventArgs e) // 取消登记 @@ -331,7 +331,7 @@ namespace PEIS.View.Enrollment if (Global.Msg("warn", "确定取消登记该信息？") == DialogResult.No) return; OnCancelRegInfo(_chooseRegItem.ID); - OnGetRegItems(); + OnGetRegItems(0); } #endregion @@ -604,7 +604,7 @@ namespace PEIS.View.Enrollment //CostToHis(_chooseRegItem.ID); OnSendToDept(_chooseRegItem.ID); - OnGetRegItems(); + OnGetRegItems(0); OnGetCheckCost(_chooseRegItem.ID); } @@ -755,9 +755,13 @@ namespace PEIS.View.Enrollment { if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return; OnRecallDept(_chooseRegItem.ID); - OnGetRegItems(); + OnGetRegItems(0); } + private void NameSearch2_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) OnGetRegItems(1); + } #endregion @@ -765,42 +769,47 @@ namespace PEIS.View.Enrollment // 获取登记列表 public event EventHandler> GetRegItems; - public void ShowRegItems(List items) + public void ShowRegItems(List items, int code) { - items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : ""); - Invoke(new Action(() => _lstRegItems = items)); - Invoke(new Action(() => { DgcRegItem.DataSource = null; DgcRegItem2.DataSource = null; })); - Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true); })); - Invoke(new Action(() => - { - var list = new List(); - DgcRegItem2.DataSource = list.Concat(items); - })); + if (code == 0) { + items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : ""); + Invoke(new Action(() => _lstRegItems = items)); + Invoke(new Action(() => DgcRegItem.DataSource = null)); + Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true); })); - if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0) - { - Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).ToList()[0])); - Invoke(new Action(() => OnGetRegInfo(_chooseRegItem.ID))); - Invoke(new Action(() => OnGetExamFeeItem(_chooseRegItem.ID, "0"))); - Invoke(new Action(() => OnGetCheckCost(_chooseRegItem.ID))); + if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0) + { + Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).ToList()[0])); + Invoke(new Action(() => OnGetRegInfo(_chooseRegItem.ID))); + Invoke(new Action(() => OnGetExamFeeItem(_chooseRegItem.ID, "0"))); + Invoke(new Action(() => OnGetCheckCost(_chooseRegItem.ID))); + } + else + { + DgcEFeeItem.DataSource = _lstEFeeItem = null; + DgcCheckCost.DataSource = _lstCheckCost = null; + _chooseRegItem = null; + RegDataBinds(_chooseRegItem); + } } else { - DgcEFeeItem.DataSource = _lstEFeeItem = null; - DgcCheckCost.DataSource = _lstCheckCost = null; - DgcCopyItem.DataSource = _lstCopyFeeItem = null; - _chooseRegItem = null; - RegDataBinds(_chooseRegItem); + Invoke(new Action(() => _lstRegItems2 = items)); + Invoke(new Action(() => DgcRegItem2.DataSource = null)); + Invoke(new Action(() => { DgcRegItem2.DataSource = _lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true); })); + if (_lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true).Count() == 0) DgcCopyItem.DataSource = _lstCopyFeeItem = null; } + DgvRegItem.ExpandAllGroups(); - Invoke(new Action(() => DgvRegItem.BestFitColumns())); + Invoke(new Action(() => { DgvRegItem.BestFitColumns(); DgvRegItem2.BestFitColumns(); })); } - protected virtual void OnGetRegItems() + protected virtual void OnGetRegItems(int code) { dynamic searchData = new ExpandoObject(); searchData.begDate = BegDate.Value.ToShortDateString(); searchData.endDate = EndDate.Value.ToShortDateString(); - searchData.name = NameSearch.Text; + searchData.name = code == 0 ? NameSearch.Text : NameSearch2.Text; + searchData.code = code; GetRegItems?.Invoke(this, new Args() { Item = searchData diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.resx b/PEIS/View/Enrollment/EnrollmentPersonForm.resx index e9565df..57b6c07 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.resx +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.resx @@ -250,7 +250,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 @@ -261,7 +261,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl @@ -277,7 +277,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH @@ -293,7 +293,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0 jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1 X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ @@ -308,7 +308,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6 E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt @@ -321,7 +321,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C @@ -334,7 +334,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO @@ -348,7 +348,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB diff --git a/PEIS/View/Enrollment/IEnrollmentPersonView.cs b/PEIS/View/Enrollment/IEnrollmentPersonView.cs index c5869d2..99b5fc2 100644 --- a/PEIS/View/Enrollment/IEnrollmentPersonView.cs +++ b/PEIS/View/Enrollment/IEnrollmentPersonView.cs @@ -28,7 +28,7 @@ namespace PEIS.View.Enrollment { // 获取登记列表 event EventHandler> GetRegItems; - void ShowRegItems(List items); + void ShowRegItems(List items, int code); // 获取登记信息 event EventHandler> GetRegInfo;