Recoding
/
PEIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、删除线

Browse Source
dhzzyy
lsm 11 months ago
parent 80ffafda8c
commit c4ec84f35b
6 changed files with 420 additions and 354 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 179
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  2. 21
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  3. 84
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  4. 2
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  5. 482
      PEIS/View/Exam/TotalForm.Designer.cs
  6. 6
      PEIS/View/Exam/TotalForm.resx

179
PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs generated
Unescape View File

@ -30,6 +30,10 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm));
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.panel1 = new System.Windows.Forms.Panel();
this.DgcOrg = new DevExpress.XtraGrid.GridControl();
@ -220,7 +224,7 @@
this.gridColumn158 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn159 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn160 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn162 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.splitter6 = new System.Windows.Forms.Splitter();
this.panel12 = new System.Windows.Forms.Panel();
@ -370,6 +374,9 @@
this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@ -2965,10 +2972,18 @@
this.gridColumn158,
this.gridColumn159,
this.gridColumn160,
this.gridColumn162});
this.gridColumn100,
this.gridColumn99});
this.DgvCheckCost2.FixedLineWidth = 1;
gridFormatRule1.Column = this.gridColumn99;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
gridFormatRule1.Rule = formatConditionRuleExpression1;
this.DgvCheckCost2.FormatRules.Add(gridFormatRule1);
this.DgvCheckCost2.GridControl = this.DgcCheckCost2;
this.DgvCheckCost2.GroupCount = 1;
this.DgvCheckCost2.GroupFormat = "{0}";
this.DgvCheckCost2.IndicatorWidth = 40;
this.DgvCheckCost2.Name = "DgvCheckCost2";
@ -2981,13 +2996,9 @@
this.DgvCheckCost2.OptionsView.ShowGroupPanel = false;
this.DgvCheckCost2.OptionsView.ShowIndicator = false;
this.DgvCheckCost2.RowHeight = 40;
this.DgvCheckCost2.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn162, DevExpress.Data.ColumnSortOrder.Ascending)});
//
// gridColumn143
//
this.gridColumn143.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn143.AppearanceCell.Options.UseFont = true;
this.gridColumn143.Caption = "订单号";
this.gridColumn143.FieldName = "ID";
this.gridColumn143.Name = "gridColumn143";
@ -3005,8 +3016,6 @@
//
// gridColumn144
//
this.gridColumn144.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn144.AppearanceCell.Options.UseFont = true;
this.gridColumn144.Caption = "体检号";
this.gridColumn144.FieldName = "EID";
this.gridColumn144.Name = "gridColumn144";
@ -3023,8 +3032,6 @@
//
// gridColumn145
//
this.gridColumn145.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn145.AppearanceCell.Options.UseFont = true;
this.gridColumn145.Caption = "姓名";
this.gridColumn145.FieldName = "Name";
this.gridColumn145.Name = "gridColumn145";
@ -3041,8 +3048,6 @@
//
// gridColumn146
//
this.gridColumn146.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn146.AppearanceCell.Options.UseFont = true;
this.gridColumn146.Caption = "费用合计";
this.gridColumn146.DisplayFormat.FormatString = "c";
this.gridColumn146.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -3062,8 +3067,6 @@
//
// gridColumn147
//
this.gridColumn147.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn147.AppearanceCell.Options.UseFont = true;
this.gridColumn147.Caption = "折扣";
this.gridColumn147.FieldName = "Discount";
this.gridColumn147.Name = "gridColumn147";
@ -3083,8 +3086,6 @@
//
// gridColumn148
//
this.gridColumn148.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn148.AppearanceCell.Options.UseFont = true;
this.gridColumn148.Caption = "实收费用";
this.gridColumn148.DisplayFormat.FormatString = "c";
this.gridColumn148.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -3108,8 +3109,6 @@
//
// gridColumn149
//
this.gridColumn149.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn149.AppearanceCell.Options.UseFont = true;
this.gridColumn149.Caption = "创建人";
this.gridColumn149.FieldName = "Creator";
this.gridColumn149.Name = "gridColumn149";
@ -3127,8 +3126,6 @@
//
// gridColumn150
//
this.gridColumn150.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn150.AppearanceCell.Options.UseFont = true;
this.gridColumn150.Caption = "创建时间";
this.gridColumn150.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn150.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3148,8 +3145,6 @@
//
// gridColumn151
//
this.gridColumn151.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn151.AppearanceCell.Options.UseFont = true;
this.gridColumn151.Caption = "记账人";
this.gridColumn151.FieldName = "Charger";
this.gridColumn151.Name = "gridColumn151";
@ -3166,8 +3161,6 @@
//
// gridColumn152
//
this.gridColumn152.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn152.AppearanceCell.Options.UseFont = true;
this.gridColumn152.Caption = "记账时间";
this.gridColumn152.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn152.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3187,8 +3180,6 @@
//
// gridColumn157
//
this.gridColumn157.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn157.AppearanceCell.Options.UseFont = true;
this.gridColumn157.Caption = "发送人";
this.gridColumn157.FieldName = "Sender";
this.gridColumn157.Name = "gridColumn157";
@ -3205,8 +3196,6 @@
//
// gridColumn158
//
this.gridColumn158.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn158.AppearanceCell.Options.UseFont = true;
this.gridColumn158.Caption = "发送时间";
this.gridColumn158.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn158.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3226,8 +3215,6 @@
//
// gridColumn159
//
this.gridColumn159.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn159.AppearanceCell.Options.UseFont = true;
this.gridColumn159.Caption = "收费人";
this.gridColumn159.FieldName = "Coster";
this.gridColumn159.Name = "gridColumn159";
@ -3244,8 +3231,6 @@
//
// gridColumn160
//
this.gridColumn160.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn160.AppearanceCell.Options.UseFont = true;
this.gridColumn160.Caption = "收费时间";
this.gridColumn160.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn160.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3263,21 +3248,23 @@
this.gridColumn160.VisibleIndex = 13;
this.gridColumn160.Width = 130;
//
// gridColumn162
//
this.gridColumn162.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn162.AppearanceCell.Options.UseFont = true;
this.gridColumn162.Caption = "团体订单";
this.gridColumn162.FieldName = "OEID";
this.gridColumn162.Name = "gridColumn162";
this.gridColumn162.OptionsColumn.AllowEdit = false;
this.gridColumn162.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.AllowMove = false;
this.gridColumn162.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.ReadOnly = true;
this.gridColumn162.OptionsFilter.AllowFilter = false;
// gridColumn99
//
this.gridColumn99.Caption = "退费时间";
this.gridColumn99.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn99.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gridColumn99.FieldName = "CancelTime";
this.gridColumn99.Name = "gridColumn99";
this.gridColumn99.OptionsColumn.AllowEdit = false;
this.gridColumn99.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn99.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn99.OptionsColumn.AllowMove = false;
this.gridColumn99.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn99.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn99.OptionsColumn.ReadOnly = true;
this.gridColumn99.OptionsFilter.AllowFilter = false;
this.gridColumn99.Visible = true;
this.gridColumn99.VisibleIndex = 15;
//
// repositoryItemMemoEdit2
//
@ -3433,8 +3420,19 @@
this.gridColumn153,
this.gridColumn154,
this.gridColumn155,
this.gridColumn156});
this.gridColumn156,
this.gridColumn101,
this.gridColumn102});
this.DgvCheckCost.FixedLineWidth = 1;
gridFormatRule2.ApplyToRow = true;
gridFormatRule2.Column = this.gridColumn102;
gridFormatRule2.Name = "Format0";
formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression2.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression2.PredefinedName = "Strikeout Text";
gridFormatRule2.Rule = formatConditionRuleExpression2;
this.DgvCheckCost.FormatRules.Add(gridFormatRule2);
this.DgvCheckCost.GridControl = this.DgcCheckCost;
this.DgvCheckCost.GroupCount = 1;
this.DgvCheckCost.GroupFormat = "";
@ -3468,8 +3466,6 @@
//
// gridColumn118
//
this.gridColumn118.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn118.AppearanceCell.Options.UseFont = true;
this.gridColumn118.Caption = "订单号";
this.gridColumn118.FieldName = "ID";
this.gridColumn118.Name = "gridColumn118";
@ -3487,8 +3483,6 @@
//
// gridColumn123
//
this.gridColumn123.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn123.AppearanceCell.Options.UseFont = true;
this.gridColumn123.Caption = "体检号";
this.gridColumn123.FieldName = "EID";
this.gridColumn123.Name = "gridColumn123";
@ -3505,8 +3499,6 @@
//
// gridColumn142
//
this.gridColumn142.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn142.AppearanceCell.Options.UseFont = true;
this.gridColumn142.Caption = "姓名";
this.gridColumn142.FieldName = "Name";
this.gridColumn142.Name = "gridColumn142";
@ -3523,8 +3515,6 @@
//
// gridColumn119
//
this.gridColumn119.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn119.AppearanceCell.Options.UseFont = true;
this.gridColumn119.Caption = "费用合计";
this.gridColumn119.DisplayFormat.FormatString = "c";
this.gridColumn119.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -3544,8 +3534,6 @@
//
// gridColumn121
//
this.gridColumn121.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn121.AppearanceCell.Options.UseFont = true;
this.gridColumn121.Caption = "折扣";
this.gridColumn121.FieldName = "Discount";
this.gridColumn121.Name = "gridColumn121";
@ -3565,8 +3553,6 @@
//
// gridColumn122
//
this.gridColumn122.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn122.AppearanceCell.Options.UseFont = true;
this.gridColumn122.Caption = "实收费用";
this.gridColumn122.DisplayFormat.FormatString = "c";
this.gridColumn122.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -3590,8 +3576,6 @@
//
// gridColumn124
//
this.gridColumn124.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn124.AppearanceCell.Options.UseFont = true;
this.gridColumn124.Caption = "创建人";
this.gridColumn124.FieldName = "Creator";
this.gridColumn124.Name = "gridColumn124";
@ -3609,8 +3593,6 @@
//
// gridColumn141
//
this.gridColumn141.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn141.AppearanceCell.Options.UseFont = true;
this.gridColumn141.Caption = "创建时间";
this.gridColumn141.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn141.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3630,8 +3612,6 @@
//
// gridColumn120
//
this.gridColumn120.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn120.AppearanceCell.Options.UseFont = true;
this.gridColumn120.Caption = "记账人";
this.gridColumn120.FieldName = "Charger";
this.gridColumn120.Name = "gridColumn120";
@ -3648,8 +3628,6 @@
//
// gridColumn125
//
this.gridColumn125.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn125.AppearanceCell.Options.UseFont = true;
this.gridColumn125.Caption = "记账时间";
this.gridColumn125.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn125.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3669,8 +3647,6 @@
//
// gridColumn153
//
this.gridColumn153.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn153.AppearanceCell.Options.UseFont = true;
this.gridColumn153.Caption = "发送人";
this.gridColumn153.FieldName = "Sender";
this.gridColumn153.Name = "gridColumn153";
@ -3687,8 +3663,6 @@
//
// gridColumn154
//
this.gridColumn154.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn154.AppearanceCell.Options.UseFont = true;
this.gridColumn154.Caption = "发送时间";
this.gridColumn154.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn154.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -3708,8 +3682,6 @@
//
// gridColumn155
//
this.gridColumn155.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn155.AppearanceCell.Options.UseFont = true;
this.gridColumn155.Caption = "收费人";
this.gridColumn155.FieldName = "Coster";
this.gridColumn155.Name = "gridColumn155";
@ -3726,8 +3698,6 @@
//
// gridColumn156
//
this.gridColumn156.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn156.AppearanceCell.Options.UseFont = true;
this.gridColumn156.Caption = "收费时间";
this.gridColumn156.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn156.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -5164,6 +5134,56 @@
//
this.gridView8.Name = "gridView8";
//
// gridColumn100
//
this.gridColumn100.Caption = "退费人";
this.gridColumn100.FieldName = "Cancer";
this.gridColumn100.Name = "gridColumn100";
this.gridColumn100.OptionsColumn.AllowEdit = false;
this.gridColumn100.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn100.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn100.OptionsColumn.AllowMove = false;
this.gridColumn100.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn100.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn100.OptionsColumn.ReadOnly = true;
this.gridColumn100.OptionsFilter.AllowFilter = false;
this.gridColumn100.Visible = true;
this.gridColumn100.VisibleIndex = 14;
//
// gridColumn101
//
this.gridColumn101.Caption = "退费人";
this.gridColumn101.FieldName = "Cancer";
this.gridColumn101.Name = "gridColumn101";
this.gridColumn101.OptionsColumn.AllowEdit = false;
this.gridColumn101.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn101.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn101.OptionsColumn.AllowMove = false;
this.gridColumn101.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn101.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn101.OptionsColumn.ReadOnly = true;
this.gridColumn101.OptionsFilter.AllowFilter = false;
this.gridColumn101.Visible = true;
this.gridColumn101.VisibleIndex = 14;
//
// gridColumn102
//
this.gridColumn102.Caption = "退费时间";
this.gridColumn102.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn102.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gridColumn102.FieldName = "CancelTime";
this.gridColumn102.Name = "gridColumn102";
this.gridColumn102.OptionsColumn.AllowEdit = false;
this.gridColumn102.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn102.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn102.OptionsColumn.AllowMove = false;
this.gridColumn102.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn102.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn102.OptionsColumn.ReadOnly = true;
this.gridColumn102.OptionsFilter.AllowFilter = false;
this.gridColumn102.Visible = true;
this.gridColumn102.VisibleIndex = 15;
//
// EnrollmentOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
@ -5590,7 +5610,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn158;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn159;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn160;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn162;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
private System.Windows.Forms.Splitter splitter6;
private System.Windows.Forms.Panel panel12;
@ -5625,5 +5644,9 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem15;
private System.Windows.Forms.ToolStripMenuItem FastRecall;
private System.Windows.Forms.ToolStripMenuItem PFastRefreshCost;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn99;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn100;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn101;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn102;
}
}

21
PEIS/View/Enrollment/EnrollmentOrgForm.cs
Unescape View File

@ -129,8 +129,6 @@ namespace PEIS.View.Enrollment
DgvCheckCost.RowStyle += DgvCheckCost_RowStyle;
DgvCheckCost.CustomDrawGroupRow += DgvCheckCost_CustomDrawGroupRow;
DgvCheckCost2.RowStyle += DgvCheckCost2_RowStyle;
DgvCheckCost2.CustomDrawGroupRow += DgvCheckCost2_CustomDrawGroupRow;
// 打印个人收费单
@ -953,11 +951,11 @@ namespace PEIS.View.Enrollment
private void TsmiPrintGroup_Click(object sender, EventArgs e) // 打印分组收费单
{
if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null).ToList().Count == 0) return;
if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return;
try
{
var list = _lstCheckCost.Where(w => w.CostTime == null && w.GroupTag).ToList();
var list = _lstCheckCost.Where(w => w.CostTime == null && w.GroupTag && w.CancelTime == null).ToList();
_pReport = ReportHelper.PrintTCheckCost(list, DgvOrg.GetRow(DgvOrg.GetSelectedRows()[0]) as EnrollmentOrg);
_pReport.Show();
@ -971,11 +969,11 @@ namespace PEIS.View.Enrollment
private void TsmiPrintTeam_Click(object sender, EventArgs e) // 打印团体收费单
{
if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null).ToList().Count == 0) return;
if (!_lstCheckCost.Any() || _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return;
try
{
var list = _lstCheckCost.Where(w => w.CostTime == null).ToList();
var list = _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList();
_pReport = ReportHelper.PrintTCheckCost(list, DgvOrg.GetRow(DgvOrg.GetSelectedRows()[0]) as EnrollmentOrg);
_pReport.Show();
@ -989,11 +987,11 @@ namespace PEIS.View.Enrollment
private void TsmiPrintPerson_Click(object sender, EventArgs e) // 打印个人收费单
{
if (!_lstCheckCost2.Any() || _lstCheckCost2.Where(w => w.CostTime == null).ToList().Count == 0) return;
if (!_lstCheckCost2.Any() || _lstCheckCost2.Where(w => w.CostTime == null && w.CancelTime == null).ToList().Count == 0) return;
try
{
var list = _lstCheckCost2.Where(w => w.CostTime == null && w.OEID == null).ToList();
var list = _lstCheckCost2.Where(w => w.CostTime == null && w.OEID == null && w.CancelTime == null).ToList();
_pReport = ReportHelper.PrintCheckCost(list, DgvEnrollment.GetRow(DgvEnrollment.GetSelectedRows()[0]) as EnrollmentPatient);
_pReport.Show();
@ -1263,13 +1261,6 @@ namespace PEIS.View.Enrollment
grid.GroupText = Convert.ToBoolean(DgvCheckCost.GetRowCellValue(index, "GroupTag")) ? "分组缴费订单" : "未分组缴费订单";
}
private void DgvCheckCost2_CustomDrawGroupRow(object sender, DevExpress.XtraGrid.Views.Base.RowObjectCustomDrawEventArgs e)
{
GridGroupRowInfo grid = e.Info as GridGroupRowInfo;
var index = DgvCheckCost2.GetDataRowHandleByGroupRowHandle(e.RowHandle);
grid.GroupText = DgvCheckCost2.GetRowCellValue(index, "OEID") == null ? "个人订单" : "团体订单";
}
private void DgvEnrollmentFeeItem_RowStyle(object sender, DevExpress.XtraGrid.Views.Grid.RowStyleEventArgs e)
{
if (DgvEnrollmentFeeItem.RowCount == 0) return;

84
PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs generated
Unescape View File

@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm));
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn142 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -46,7 +47,6 @@
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.RegListPanel = new System.Windows.Forms.Panel();
this.DgcRegItem = new DevExpress.XtraGrid.GridControl();
this.RegMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@ -231,6 +231,7 @@
this.DgcCheckCost = new DevExpress.XtraGrid.GridControl();
this.DgvCheckCost = new DevExpress.XtraGrid.Views.Grid.GridView();
this.repositoryItemMemoEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
this.RegListPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcRegItem)).BeginInit();
this.RegMenu.SuspendLayout();
@ -292,10 +293,26 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit3)).BeginInit();
this.SuspendLayout();
//
// gridColumn52
//
this.gridColumn52.Caption = "退费时间";
this.gridColumn52.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn52.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gridColumn52.FieldName = "CancelTime";
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.OptionsColumn.AllowEdit = false;
this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.AllowMove = false;
this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.ReadOnly = true;
this.gridColumn52.OptionsFilter.AllowFilter = false;
this.gridColumn52.Visible = true;
this.gridColumn52.VisibleIndex = 15;
//
// gridColumn118
//
this.gridColumn118.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn118.AppearanceCell.Options.UseFont = true;
this.gridColumn118.Caption = "订单号";
this.gridColumn118.FieldName = "ID";
this.gridColumn118.Name = "gridColumn118";
@ -313,8 +330,6 @@
//
// gridColumn123
//
this.gridColumn123.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn123.AppearanceCell.Options.UseFont = true;
this.gridColumn123.Caption = "体检号";
this.gridColumn123.FieldName = "EID";
this.gridColumn123.Name = "gridColumn123";
@ -331,8 +346,6 @@
//
// gridColumn142
//
this.gridColumn142.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn142.AppearanceCell.Options.UseFont = true;
this.gridColumn142.Caption = "姓名";
this.gridColumn142.FieldName = "Name";
this.gridColumn142.Name = "gridColumn142";
@ -349,8 +362,6 @@
//
// gridColumn119
//
this.gridColumn119.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn119.AppearanceCell.Options.UseFont = true;
this.gridColumn119.Caption = "费用合计";
this.gridColumn119.DisplayFormat.FormatString = "c";
this.gridColumn119.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -370,8 +381,6 @@
//
// gridColumn121
//
this.gridColumn121.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn121.AppearanceCell.Options.UseFont = true;
this.gridColumn121.Caption = "折扣";
this.gridColumn121.FieldName = "Discount";
this.gridColumn121.Name = "gridColumn121";
@ -391,8 +400,6 @@
//
// gridColumn122
//
this.gridColumn122.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn122.AppearanceCell.Options.UseFont = true;
this.gridColumn122.Caption = "实收费用";
this.gridColumn122.DisplayFormat.FormatString = "c";
this.gridColumn122.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
@ -416,8 +423,6 @@
//
// gridColumn124
//
this.gridColumn124.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn124.AppearanceCell.Options.UseFont = true;
this.gridColumn124.Caption = "创建人";
this.gridColumn124.FieldName = "Creator";
this.gridColumn124.Name = "gridColumn124";
@ -435,8 +440,6 @@
//
// gridColumn141
//
this.gridColumn141.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn141.AppearanceCell.Options.UseFont = true;
this.gridColumn141.Caption = "创建时间";
this.gridColumn141.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn141.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -456,8 +459,6 @@
//
// gridColumn33
//
this.gridColumn33.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn33.AppearanceCell.Options.UseFont = true;
this.gridColumn33.Caption = "记账人";
this.gridColumn33.FieldName = "Charger";
this.gridColumn33.Name = "gridColumn33";
@ -474,8 +475,6 @@
//
// gridColumn34
//
this.gridColumn34.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn34.AppearanceCell.Options.UseFont = true;
this.gridColumn34.Caption = "记账时间";
this.gridColumn34.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn34.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -495,8 +494,6 @@
//
// gridColumn35
//
this.gridColumn35.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn35.AppearanceCell.Options.UseFont = true;
this.gridColumn35.Caption = "发送人";
this.gridColumn35.FieldName = "Sender";
this.gridColumn35.Name = "gridColumn35";
@ -513,8 +510,6 @@
//
// gridColumn36
//
this.gridColumn36.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn36.AppearanceCell.Options.UseFont = true;
this.gridColumn36.Caption = "发送时间";
this.gridColumn36.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn36.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -534,8 +529,6 @@
//
// gridColumn37
//
this.gridColumn37.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn37.AppearanceCell.Options.UseFont = true;
this.gridColumn37.Caption = "收费人";
this.gridColumn37.FieldName = "Coster";
this.gridColumn37.Name = "gridColumn37";
@ -552,8 +545,6 @@
//
// gridColumn38
//
this.gridColumn38.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn38.AppearanceCell.Options.UseFont = true;
this.gridColumn38.Caption = "收费时间";
this.gridColumn38.DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
this.gridColumn38.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@ -571,22 +562,6 @@
this.gridColumn38.VisibleIndex = 13;
this.gridColumn38.Width = 130;
//
// gridColumn52
//
this.gridColumn52.Caption = "退费时间";
this.gridColumn52.FieldName = "CancelTime";
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.OptionsColumn.AllowEdit = false;
this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.AllowMove = false;
this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn52.OptionsColumn.ReadOnly = true;
this.gridColumn52.OptionsFilter.AllowFilter = false;
this.gridColumn52.Visible = true;
this.gridColumn52.VisibleIndex = 14;
//
// RegListPanel
//
this.RegListPanel.BackColor = System.Drawing.Color.White;
@ -2736,11 +2711,11 @@
this.gridColumn36,
this.gridColumn37,
this.gridColumn38,
this.gridColumn53,
this.gridColumn52});
this.DgvCheckCost.FixedLineWidth = 1;
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn52;
gridFormatRule1.ColumnApplyTo = this.gridColumn123;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
@ -2768,6 +2743,22 @@
this.repositoryItemMemoEdit3.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.repositoryItemMemoEdit3.Name = "repositoryItemMemoEdit3";
//
// gridColumn53
//
this.gridColumn53.Caption = "退费人";
this.gridColumn53.FieldName = "Cancer";
this.gridColumn53.Name = "gridColumn53";
this.gridColumn53.OptionsColumn.AllowEdit = false;
this.gridColumn53.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn53.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn53.OptionsColumn.AllowMove = false;
this.gridColumn53.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn53.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn53.OptionsColumn.ReadOnly = true;
this.gridColumn53.OptionsFilter.AllowFilter = false;
this.gridColumn53.Visible = true;
this.gridColumn53.VisibleIndex = 14;
//
// EnrollmentPersonForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
@ -3056,5 +3047,6 @@
private System.Windows.Forms.ToolStripMenuItem FastRecallDept;
private System.Windows.Forms.ToolStripMenuItem FastRefreshCost;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
}
}

2
PEIS/View/Enrollment/EnrollmentPersonForm.cs
Unescape View File

@ -548,7 +548,7 @@ namespace PEIS.View.Enrollment
try
{
var list = _lstCheckCost.Where(w => w.CostTime == null).ToList();
var list = _lstCheckCost.Where(w => w.CostTime == null && w.CancelTime == null).ToList();
pReport = ReportHelper.PrintCheckCost(list, _chooseRegItem);
pReport.Show();

482
PEIS/View/Exam/TotalForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
PEIS/View/Exam/TotalForm.resx
Unescape View File

@ -117,12 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>377, 55</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>497, 55</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>497, 55</value>
</metadata>

Write Preview
Loading…
Cancel
Save