From 7c1f8a3dc394965aa23426b23a02a0d0f0be881d Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 11 Jul 2024 15:22:28 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C2=E3=80=81=E9=80=80=E8=B4=B9?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/EnrollmentPatient.cs | 5 +- .../Enrollment/EnrollmentPatientModel.cs | 6 +- PEIS/Model/EnrollmentFeeItemModel.cs | 2 +- .../Enrollment/EnrollmentOrgForm.Designer.cs | 263 ++++++++++-------- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 137 ++++++++- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 6 + 6 files changed, 292 insertions(+), 127 deletions(-) diff --git a/PEIS/Entity/EnrollmentPatient.cs b/PEIS/Entity/EnrollmentPatient.cs index 87a6d49..3a5fbf0 100644 --- a/PEIS/Entity/EnrollmentPatient.cs +++ b/PEIS/Entity/EnrollmentPatient.cs @@ -101,7 +101,10 @@ namespace PEIS.Entity [RefFlag(true)] public DateTime? CostTime { get; set; } - + + [RefFlag(true)] + public Int64 RowNumber { get; set; } + #endregion Other } } \ No newline at end of file diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index fa75aa7..7cfffa2 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -69,14 +69,14 @@ namespace PEIS.Model.Enrollment return DAOHelp.GetDataBySQL($@"Select a.Name, a.ID, a.SEX, - a.Age, - a.AgeClass, + CONVERT(VARCHAR,a.Age) + a.AgeClass AgeClass, b.BirthDay, a.CardNo, a.CardType, b.Marriage, c.DeptName AS GroupName, - a.SignTime, + a.SignTime, + a.Tel1, CASE WHEN a.SignTime IS NULL THEN NULL ELSE '已发送' diff --git a/PEIS/Model/EnrollmentFeeItemModel.cs b/PEIS/Model/EnrollmentFeeItemModel.cs index c8e7bee..aacdf38 100644 --- a/PEIS/Model/EnrollmentFeeItemModel.cs +++ b/PEIS/Model/EnrollmentFeeItemModel.cs @@ -33,7 +33,7 @@ namespace PEIS.Model public List GetItemsByEnrollmentID(Int64 enrollmentID) { - return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.OrderNo, a.DeptName"); + return DAOHelp.GetDataBySQL($"Select a.*, b.Address, c.IsHide From Enrollment_FeeItem a LEFT JOIN Dict_Dept b ON a.DeptCode = b.HISCode LEFT JOIN Dict_FeeItem c ON a.KeyNo = c.KeyNo Where a.EID = {enrollmentID} Order by a.PackName DESC, a.OrderNo, a.DeptName"); } public List GetItems4CheckCost(Int64 oeID, Int64 enrollmentID) diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 5da75bf..3ff3058 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -28,12 +28,13 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm)); DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule(); DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression(); + this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.panel1 = new System.Windows.Forms.Panel(); this.DgcOrg = new DevExpress.XtraGrid.GridControl(); @@ -66,7 +67,7 @@ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.DgcGroupPatient = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); this.FastGroupMove = new System.Windows.Forms.ToolStripMenuItem(); this.DgvGroupPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -200,7 +201,7 @@ this.xtraTabControl4 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost2 = new DevExpress.XtraGrid.GridControl(); - this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.PersonCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.PFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.PFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -224,14 +225,14 @@ this.gridColumn158 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn159 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn160 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.splitter6 = new System.Windows.Forms.Splitter(); this.panel12 = new System.Windows.Forms.Panel(); this.xtraTabControl3 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.DgcCheckCost = new DevExpress.XtraGrid.GridControl(); - this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.TeamCostFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.TFastCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastAllCharge = new System.Windows.Forms.ToolStripMenuItem(); this.TFastDeleteCost = new System.Windows.Forms.ToolStripMenuItem(); @@ -255,6 +256,7 @@ this.gridColumn154 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn155 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn156 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemMemoEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.splitter5 = new System.Windows.Forms.Splitter(); this.panel8 = new System.Windows.Forms.Panel(); @@ -321,10 +323,11 @@ this.splitterControl1 = new DevExpress.XtraEditors.SplitterControl(); this.panel11 = new System.Windows.Forms.Panel(); this.DgcEnrollment = new DevExpress.XtraGrid.GridControl(); - this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this.InfoFastMenu = new System.Windows.Forms.ContextMenuStrip(); this.FastCamera = new System.Windows.Forms.ToolStripMenuItem(); this.FastDelete = new System.Windows.Forms.ToolStripMenuItem(); this.FastExport = new System.Windows.Forms.ToolStripMenuItem(); + this.FastExportTime = new System.Windows.Forms.ToolStripMenuItem(); this.FastRecall = new System.Windows.Forms.ToolStripMenuItem(); this.FastGroup = new System.Windows.Forms.ToolStripMenuItem(); this.FastCancelGroup = new System.Windows.Forms.ToolStripMenuItem(); @@ -335,13 +338,13 @@ this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn107 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn108 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn96 = 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(); this.gridColumn109 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -374,9 +377,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.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -474,6 +474,42 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit(); this.SuspendLayout(); // + // gridColumn99 + // + this.gridColumn99.Caption = "退费时间"; + this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn99.FieldName = "CancelTime"; + this.gridColumn99.Name = "gridColumn99"; + this.gridColumn99.OptionsColumn.AllowEdit = false; + this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.AllowMove = false; + this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn99.OptionsColumn.ReadOnly = true; + this.gridColumn99.OptionsFilter.AllowFilter = false; + this.gridColumn99.Visible = true; + this.gridColumn99.VisibleIndex = 15; + // + // gridColumn102 + // + this.gridColumn102.Caption = "退费时间"; + this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn102.FieldName = "CancelTime"; + this.gridColumn102.Name = "gridColumn102"; + this.gridColumn102.OptionsColumn.AllowEdit = false; + this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.AllowMove = false; + this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn102.OptionsColumn.ReadOnly = true; + this.gridColumn102.OptionsFilter.AllowFilter = false; + this.gridColumn102.Visible = true; + this.gridColumn102.VisibleIndex = 15; + // // repositoryItemMemoEdit21 // this.repositoryItemMemoEdit21.Appearance.Options.UseTextOptions = true; @@ -2975,6 +3011,7 @@ this.gridColumn100, this.gridColumn99}); this.DgvCheckCost2.FixedLineWidth = 1; + gridFormatRule1.ApplyToRow = true; gridFormatRule1.Column = this.gridColumn99; gridFormatRule1.Name = "Format0"; formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray; @@ -3248,23 +3285,21 @@ this.gridColumn160.VisibleIndex = 13; this.gridColumn160.Width = 130; // - // gridColumn99 + // gridColumn100 // - this.gridColumn99.Caption = "退费时间"; - this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; - this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn99.FieldName = "CancelTime"; - this.gridColumn99.Name = "gridColumn99"; - this.gridColumn99.OptionsColumn.AllowEdit = false; - this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.AllowMove = false; - this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn99.OptionsColumn.ReadOnly = true; - this.gridColumn99.OptionsFilter.AllowFilter = false; - this.gridColumn99.Visible = true; - this.gridColumn99.VisibleIndex = 15; + this.gridColumn100.Caption = "退费人"; + this.gridColumn100.FieldName = "Cancer"; + this.gridColumn100.Name = "gridColumn100"; + this.gridColumn100.OptionsColumn.AllowEdit = false; + this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.AllowMove = false; + this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn100.OptionsColumn.ReadOnly = true; + this.gridColumn100.OptionsFilter.AllowFilter = false; + this.gridColumn100.Visible = true; + this.gridColumn100.VisibleIndex = 14; // // repositoryItemMemoEdit2 // @@ -3715,6 +3750,22 @@ this.gridColumn156.VisibleIndex = 13; this.gridColumn156.Width = 130; // + // gridColumn101 + // + this.gridColumn101.Caption = "退费人"; + this.gridColumn101.FieldName = "Cancer"; + this.gridColumn101.Name = "gridColumn101"; + this.gridColumn101.OptionsColumn.AllowEdit = false; + this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.AllowMove = false; + this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn101.OptionsColumn.ReadOnly = true; + this.gridColumn101.OptionsFilter.AllowFilter = false; + this.gridColumn101.Visible = true; + this.gridColumn101.VisibleIndex = 14; + // // repositoryItemMemoEdit3 // this.repositoryItemMemoEdit3.Appearance.Options.UseTextOptions = true; @@ -4599,18 +4650,19 @@ this.FastCamera, this.FastDelete, this.FastExport, + this.FastExportTime, this.FastRecall, this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(241, 220); + this.InfoFastMenu.Size = new System.Drawing.Size(337, 300); // // FastCamera // this.FastCamera.Image = ((System.Drawing.Image)(resources.GetObject("FastCamera.Image"))); this.FastCamera.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCamera.Name = "FastCamera"; - this.FastCamera.Size = new System.Drawing.Size(240, 36); + this.FastCamera.Size = new System.Drawing.Size(336, 36); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4618,33 +4670,40 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(240, 36); + this.FastDelete.Size = new System.Drawing.Size(336, 36); this.FastDelete.Text = "删除成员"; // // FastExport // this.FastExport.Image = global::PEIS.Properties.Resources.Excel; this.FastExport.Name = "FastExport"; - this.FastExport.Size = new System.Drawing.Size(240, 36); - this.FastExport.Text = "导出数据"; + this.FastExport.Size = new System.Drawing.Size(336, 36); + this.FastExport.Text = "导出所有成员"; + // + // FastExportTime + // + this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel; + this.FastExportTime.Name = "FastExportTime"; + this.FastExportTime.Size = new System.Drawing.Size(336, 36); + this.FastExportTime.Text = "导出指定时间范围成员"; // // FastRecall // this.FastRecall.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecall.Name = "FastRecall"; - this.FastRecall.Size = new System.Drawing.Size(240, 36); + this.FastRecall.Size = new System.Drawing.Size(336, 36); this.FastRecall.Text = "撤回发送"; // // FastGroup // this.FastGroup.Name = "FastGroup"; - this.FastGroup.Size = new System.Drawing.Size(240, 36); + this.FastGroup.Size = new System.Drawing.Size(336, 36); this.FastGroup.Text = "组合缴费"; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(240, 36); + this.FastCancelGroup.Size = new System.Drawing.Size(336, 36); this.FastCancelGroup.Text = "取消组合缴费"; // // DgvEnrollment @@ -4663,13 +4722,13 @@ this.gridColumn103, this.gridColumn89, this.gridColumn90, - this.gridColumn107, this.gridColumn108, this.gridColumn91, this.gridColumn93, this.gridColumn94, this.gridColumn95, this.gridColumn96, + this.gridColumn104, this.gridColumn92}); this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; @@ -4738,6 +4797,8 @@ this.gridColumn103.Name = "gridColumn103"; this.gridColumn103.OptionsColumn.AllowEdit = false; this.gridColumn103.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn103.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn103.OptionsColumn.AllowMove = false; this.gridColumn103.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn103.OptionsColumn.ReadOnly = true; this.gridColumn103.OptionsFilter.AllowFilter = false; @@ -4756,6 +4817,8 @@ this.gridColumn89.Name = "gridColumn89"; this.gridColumn89.OptionsColumn.AllowEdit = false; this.gridColumn89.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn89.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn89.OptionsColumn.AllowMove = false; this.gridColumn89.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn89.OptionsColumn.ReadOnly = true; this.gridColumn89.OptionsFilter.AllowFilter = false; @@ -4774,6 +4837,8 @@ this.gridColumn90.Name = "gridColumn90"; this.gridColumn90.OptionsColumn.AllowEdit = false; this.gridColumn90.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn90.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn90.OptionsColumn.AllowMove = false; this.gridColumn90.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn90.OptionsColumn.ReadOnly = true; this.gridColumn90.OptionsFilter.AllowFilter = false; @@ -4781,40 +4846,24 @@ this.gridColumn90.VisibleIndex = 3; this.gridColumn90.Width = 40; // - // gridColumn107 - // - this.gridColumn107.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); - this.gridColumn107.AppearanceCell.Options.UseFont = true; - this.gridColumn107.AppearanceHeader.Options.UseTextOptions = true; - this.gridColumn107.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.gridColumn107.Caption = "年龄"; - this.gridColumn107.FieldName = "Age"; - this.gridColumn107.Name = "gridColumn107"; - this.gridColumn107.OptionsColumn.AllowEdit = false; - this.gridColumn107.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn107.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn107.OptionsColumn.ReadOnly = true; - this.gridColumn107.OptionsFilter.AllowFilter = false; - this.gridColumn107.Visible = true; - this.gridColumn107.VisibleIndex = 4; - this.gridColumn107.Width = 40; - // // gridColumn108 // this.gridColumn108.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn108.AppearanceCell.Options.UseFont = true; this.gridColumn108.AppearanceHeader.Options.UseTextOptions = true; this.gridColumn108.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - this.gridColumn108.Caption = " "; + this.gridColumn108.Caption = "年龄"; this.gridColumn108.FieldName = "AgeClass"; this.gridColumn108.Name = "gridColumn108"; this.gridColumn108.OptionsColumn.AllowEdit = false; this.gridColumn108.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn108.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn108.OptionsColumn.AllowMove = false; this.gridColumn108.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn108.OptionsColumn.ReadOnly = true; this.gridColumn108.OptionsFilter.AllowFilter = false; this.gridColumn108.Visible = true; - this.gridColumn108.VisibleIndex = 5; + this.gridColumn108.VisibleIndex = 4; this.gridColumn108.Width = 30; // // gridColumn91 @@ -4826,10 +4875,12 @@ this.gridColumn91.Name = "gridColumn91"; this.gridColumn91.OptionsColumn.AllowEdit = false; this.gridColumn91.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn91.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn91.OptionsColumn.AllowMove = false; this.gridColumn91.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn91.OptionsColumn.ReadOnly = true; this.gridColumn91.Visible = true; - this.gridColumn91.VisibleIndex = 6; + this.gridColumn91.VisibleIndex = 5; // // gridColumn93 // @@ -4842,11 +4893,14 @@ this.gridColumn93.Name = "gridColumn93"; this.gridColumn93.OptionsColumn.AllowEdit = false; this.gridColumn93.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.AllowMove = false; this.gridColumn93.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn93.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn93.OptionsColumn.ReadOnly = true; this.gridColumn93.OptionsFilter.AllowFilter = false; this.gridColumn93.Visible = true; - this.gridColumn93.VisibleIndex = 7; + this.gridColumn93.VisibleIndex = 6; this.gridColumn93.Width = 60; // // gridColumn94 @@ -4860,13 +4914,16 @@ this.gridColumn94.Name = "gridColumn94"; this.gridColumn94.OptionsColumn.AllowEdit = false; this.gridColumn94.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.AllowMove = false; this.gridColumn94.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn94.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn94.OptionsColumn.ReadOnly = true; this.gridColumn94.OptionsFilter.AllowFilter = false; this.gridColumn94.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); this.gridColumn94.Visible = true; - this.gridColumn94.VisibleIndex = 8; + this.gridColumn94.VisibleIndex = 7; this.gridColumn94.Width = 100; // // gridColumn95 @@ -4880,11 +4937,14 @@ this.gridColumn95.Name = "gridColumn95"; this.gridColumn95.OptionsColumn.AllowEdit = false; this.gridColumn95.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.AllowMove = false; this.gridColumn95.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn95.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn95.OptionsColumn.ReadOnly = true; this.gridColumn95.OptionsFilter.AllowFilter = false; this.gridColumn95.Visible = true; - this.gridColumn95.VisibleIndex = 9; + this.gridColumn95.VisibleIndex = 8; this.gridColumn95.Width = 80; // // gridColumn96 @@ -4898,13 +4958,34 @@ this.gridColumn96.Name = "gridColumn96"; this.gridColumn96.OptionsColumn.AllowEdit = false; this.gridColumn96.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn96.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn96.OptionsColumn.AllowMove = false; this.gridColumn96.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; this.gridColumn96.OptionsColumn.ReadOnly = true; this.gridColumn96.OptionsFilter.AllowFilter = false; this.gridColumn96.Visible = true; - this.gridColumn96.VisibleIndex = 10; + this.gridColumn96.VisibleIndex = 9; this.gridColumn96.Width = 160; // + // gridColumn104 + // + this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn104.AppearanceCell.Options.UseFont = true; + this.gridColumn104.Caption = "签到时间"; + this.gridColumn104.FieldName = "SignTime"; + this.gridColumn104.GroupFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; + this.gridColumn104.GroupFormat.FormatType = DevExpress.Utils.FormatType.DateTime; + this.gridColumn104.Name = "gridColumn104"; + this.gridColumn104.OptionsColumn.AllowEdit = false; + this.gridColumn104.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.AllowMove = false; + this.gridColumn104.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn104.OptionsColumn.ReadOnly = true; + this.gridColumn104.OptionsFilter.AllowFilter = false; + this.gridColumn104.Visible = true; + this.gridColumn104.VisibleIndex = 11; + // // gridColumn92 // this.gridColumn92.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -4912,8 +4993,15 @@ this.gridColumn92.Caption = "状态"; this.gridColumn92.FieldName = "Signer"; this.gridColumn92.Name = "gridColumn92"; + this.gridColumn92.OptionsColumn.AllowEdit = false; + this.gridColumn92.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.AllowMove = false; + this.gridColumn92.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn92.OptionsColumn.ReadOnly = true; + this.gridColumn92.OptionsFilter.AllowFilter = false; this.gridColumn92.Visible = true; - this.gridColumn92.VisibleIndex = 11; + this.gridColumn92.VisibleIndex = 10; // // PatientSearch // @@ -5134,56 +5222,6 @@ // this.gridView8.Name = "gridView8"; // - // gridColumn100 - // - this.gridColumn100.Caption = "退费人"; - this.gridColumn100.FieldName = "Cancer"; - this.gridColumn100.Name = "gridColumn100"; - this.gridColumn100.OptionsColumn.AllowEdit = false; - this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.AllowMove = false; - this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn100.OptionsColumn.ReadOnly = true; - this.gridColumn100.OptionsFilter.AllowFilter = false; - this.gridColumn100.Visible = true; - this.gridColumn100.VisibleIndex = 14; - // - // gridColumn101 - // - this.gridColumn101.Caption = "退费人"; - this.gridColumn101.FieldName = "Cancer"; - this.gridColumn101.Name = "gridColumn101"; - this.gridColumn101.OptionsColumn.AllowEdit = false; - this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.AllowMove = false; - this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn101.OptionsColumn.ReadOnly = true; - this.gridColumn101.OptionsFilter.AllowFilter = false; - this.gridColumn101.Visible = true; - this.gridColumn101.VisibleIndex = 14; - // - // gridColumn102 - // - this.gridColumn102.Caption = "退费时间"; - this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"; - this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn102.FieldName = "CancelTime"; - this.gridColumn102.Name = "gridColumn102"; - this.gridColumn102.OptionsColumn.AllowEdit = false; - this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.AllowMove = false; - this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn102.OptionsColumn.ReadOnly = true; - this.gridColumn102.OptionsFilter.AllowFilter = false; - this.gridColumn102.Visible = true; - this.gridColumn102.VisibleIndex = 15; - // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); @@ -5388,7 +5426,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn95; private DevExpress.XtraGrid.Columns.GridColumn gridColumn96; private DevExpress.XtraGrid.Columns.GridColumn gridColumn103; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn107; private DevExpress.XtraGrid.Columns.GridColumn gridColumn108; private DevExpress.XtraGrid.Columns.GridColumn gridColumn109; private System.Windows.Forms.Splitter splitter8; @@ -5648,5 +5685,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn100; private DevExpress.XtraGrid.Columns.GridColumn gridColumn101; private DevExpress.XtraGrid.Columns.GridColumn gridColumn102; + private System.Windows.Forms.ToolStripMenuItem FastExportTime; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn104; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 21cf424..fc60635 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1,4 +1,7 @@ -using DevExpress.XtraGrid.Views.Grid.ViewInfo; +using DevExpress.Utils; +using DevExpress.XtraGrid.Columns; +using DevExpress.XtraGrid.Views.Grid; +using DevExpress.XtraGrid.Views.Grid.ViewInfo; using DevExpress.XtraPrinting.Native; using PEIS.Base; using PEIS.Entity; @@ -8,6 +11,7 @@ using PEIS.Utils; using PEIS.View.Base; using System; using System.Collections.Generic; +using System.Data; using System.Drawing; using System.Globalization; using System.Linq; @@ -153,6 +157,7 @@ namespace PEIS.View.Enrollment FeeItemSearch2.TextChanged += FeeItemSearch2_TextChanged; FastGroupMove.Click += FastGroupMove_Click; FastExport.Click += FastExport_Click; + FastExportTime.Click += FastExportTime_Click; FastDelete.Click += FastDelete_Click; FastGroup.Click += FastGroup_Click; FastCancelGroup.Click += FastCancelGroup_Click; @@ -847,7 +852,7 @@ namespace PEIS.View.Enrollment } } - private void FastExport_Click(object sender, EventArgs e) // 导出团体成员 + private void FastExport_Click(object sender, EventArgs e) // 导出所有团体成员 { if (_lstEnrollmentPatient.Count != 0) { @@ -863,12 +868,112 @@ namespace PEIS.View.Enrollment options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value; options.ExportType = DevExpress.Export.ExportType.WYSIWYG; + // 首先，创建一个新的列对象 + GridColumn newColumn = new GridColumn(); + // 设置列的标题，例如"序号" + newColumn.Caption = "序号"; + // 设置列的字段名称，这将用于数据绑定 + newColumn.FieldName = "RowNumber"; + newColumn.VisibleIndex = 0; + newColumn.AppearanceCell.Font = new Font("微软雅黑", 12); + + // 将列添加到GridView的Columns集合中 + DgvEnrollment.Columns.Add(newColumn); + + for (int i = 0; i < _lstEnrollmentPatient.Count(); i++) + { + // 使用GetRowCellValue方法获取当前行的序号列的值 + int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 + DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1); // 设置序号列的值 + } DgcEnrollment.ExportToXls(saveFileDialog.FileName, options); - + DgvEnrollment.Columns.Remove(newColumn); } } + } + + private void FastExportTime_Click(object sender, EventArgs e) // 导出指定时间范围成员 + { + DateTime currentDate = DateTime.Now; + + Form dateForm = new Form(); + dateForm.Font = new Font("微软雅黑", 12); + dateForm.Text = "时间选择器"; + dateForm.StartPosition = FormStartPosition.CenterScreen; + dateForm.Size = new Size(330, 226); + Label begLabel = new Label(); + begLabel.Location = new Point(10, 20); + begLabel.Text = "开始时间："; + + DateTimePicker begTime = new DateTimePicker(); + begTime.Location = new Point(110, 20); + begTime.Value = currentDate.AddDays(-6); + + Label endLabel = new Label(); + endLabel.Location = new Point(10, 70); + endLabel.Text = "结束时间："; + + DateTimePicker endTime = new DateTimePicker(); + endTime.Location = new Point(110, 70); + endTime.Value = currentDate; + + Button confirmBtn = new Button(); + confirmBtn.Text = "确认选择"; + confirmBtn.Location = new Point(110, 120); + confirmBtn.AutoSize = true; + confirmBtn.Click += delegate (object a, EventArgs b) + { + if (_lstEnrollmentPatient.Count != 0) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.Title = "导出Excel"; + saveFileDialog.FileName = "团体名单"; + saveFileDialog.Filter = "Excel文件(*.xls)|*.xls"; + DialogResult dialogResult = saveFileDialog.ShowDialog(this); + if (dialogResult == DialogResult.OK) + { + DevExpress.XtraPrinting.XlsExportOptionsEx options = new DevExpress.XtraPrinting.XlsExportOptionsEx(); + options.ShowGridLines = true; + options.TextExportMode = DevExpress.XtraPrinting.TextExportMode.Value; + options.ExportType = DevExpress.Export.ExportType.WYSIWYG; + + // 首先，创建一个新的列对象 + GridColumn newColumn = new GridColumn(); + // 设置列的标题，例如"序号" + newColumn.Caption = "序号"; + // 设置列的字段名称，这将用于数据绑定 + newColumn.FieldName = "RowNumber"; + newColumn.VisibleIndex = 0; + newColumn.AppearanceCell.Font = new Font("微软雅黑", 12); + + // 将列添加到GridView的Columns集合中 + DgvEnrollment.Columns.Add(newColumn); + + + DgcEnrollment.DataSource = _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date); + for (int i = 0; i < _lstEnrollmentPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date).Count(); i++) + { + // 使用GetRowCellValue方法获取当前行的序号列的值 + int rowNumber = DgvEnrollment.GetRowHandle(i); // 行句柄 + DgvEnrollment.SetRowCellValue(rowNumber, "RowNumber", i + 1); // 设置序号列的值 + } + + DgcEnrollment.ExportToXls(saveFileDialog.FileName, options); + DgvEnrollment.Columns.Remove(newColumn); + } + } + ShowEnrollmentPatient(_lstEnrollmentPatient); + dateForm.Close(); + }; + + dateForm.Controls.Add(begLabel); + dateForm.Controls.Add(begTime); + dateForm.Controls.Add(endLabel); + dateForm.Controls.Add(endTime); + dateForm.Controls.Add(confirmBtn); + dateForm.ShowDialog(); } private void FastDelete_Click(object sender, EventArgs e) // 删除未签到成员 @@ -878,7 +983,7 @@ namespace PEIS.View.Enrollment OnCancelRegInfo(item.ID); } - private void DgvEnrollment_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e) + private void DgvEnrollment_RowCellClick(object sender, RowCellClickEventArgs e) { if (e.Column.AbsoluteIndex == 0) { @@ -1056,6 +1161,12 @@ namespace PEIS.View.Enrollment return; } + if(item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + if (item == null) return; OnDeleteOrder(item.ID); OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID); @@ -1168,6 +1279,12 @@ namespace PEIS.View.Enrollment return; } + if (item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + if (item == null) return; OnDeleteOrder(item.ID); OnGetCheckCost(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString()), _chooseRegItem.ID); @@ -1216,7 +1333,7 @@ namespace PEIS.View.Enrollment #endregion 交互事件 - private void DgvCheckCost_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvCheckCost_RowStyle(object sender, RowStyleEventArgs e) { if (DgvCheckCost.RowCount == 0) return; if (DgvCheckCost.GetRowCellValue(e.RowHandle, "SendTime") != null) @@ -1235,7 +1352,7 @@ namespace PEIS.View.Enrollment e.Appearance.ForeColor = Color.Black; } - private void DgvCheckCost2_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvCheckCost2_RowStyle(object sender, RowStyleEventArgs e) { if (DgvCheckCost2.RowCount == 0) return; if (DgvCheckCost2.GetRowCellValue(e.RowHandle, "SendTime") != null) @@ -1261,7 +1378,7 @@ namespace PEIS.View.Enrollment grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单"; } - private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e) + private void DgvEnrollmentFeeItem_RowStyle(object sender, RowStyleEventArgs e) { if (DgvEnrollmentFeeItem.RowCount == 0) return; e.Appearance.ForeColor = DgvEnrollmentFeeItem.GetRowCellValue(e.RowHandle, "OrderNo") == null ? Color.Black : Color.DodgerBlue; @@ -1335,7 +1452,7 @@ namespace PEIS.View.Enrollment splitter7.Visible = PnlFeeItem.Visible; } - private void DgvOrg_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvOrg_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); @@ -1403,13 +1520,13 @@ namespace PEIS.View.Enrollment } } - private void DgvGroupPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvGroupPatient_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); } - private void DgvPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + private void DgvPatient_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) { if (e.RowHandle >= 0) e.Info.DisplayText = (e.RowHandle + 1).ToString(); diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index cc0983b..a86fa90 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -649,6 +649,12 @@ namespace PEIS.View.Enrollment return; } + if (item?.CancelTime != null) + { + Global.Msg("info", "该订单为退费订单留存记录，不能删除！"); + return; + } + OnDeleteOrder(item.ID); }