diff --git a/PEIS/Entity/BasePatient.cs b/PEIS/Entity/BasePatient.cs
index 466435e..37ebcce 100644
--- a/PEIS/Entity/BasePatient.cs
+++ b/PEIS/Entity/BasePatient.cs
@@ -86,6 +86,28 @@ namespace PEIS.Entity
}
+ ///
+ /// 验证
+ ///
+ ///
+ public bool Validate()
+ {
+ if (string.IsNullOrEmpty(Name)) return false;
+ if (string.IsNullOrEmpty(Sex)) return false;
+ if (string.IsNullOrEmpty(Nation)) return false;
+ if (string.IsNullOrEmpty(Marriage)) return false;
+ if (CardNo?.Trim()?.Length != 18) return false;
+ var year = CardNo.Substring(6, 4);
+ var month = CardNo.Substring(10, 2);
+ var day = CardNo.Substring(12, 2);
+ var isDay = DateTime.TryParse($"{year}-{month}-{day}", out var birthday);
+ if (!isDay) return false;
+ Birthday = birthday;
+ CardType = "居民身份证";
+
+
+ return true;
+ }
public virtual bool Exits()
{
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/PEIS.csproj b/PEIS/PEIS.csproj
index 83cf1cb..4249c07 100644
--- a/PEIS/PEIS.csproj
+++ b/PEIS/PEIS.csproj
@@ -667,6 +667,9 @@
Always
+
+ Always
+
diff --git a/PEIS/Presenter/EnrollmentPersonPresenter.cs b/PEIS/Presenter/EnrollmentPersonPresenter.cs
index bdc2be5..b4f2101 100644
--- a/PEIS/Presenter/EnrollmentPersonPresenter.cs
+++ b/PEIS/Presenter/EnrollmentPersonPresenter.cs
@@ -58,7 +58,6 @@ namespace PEIS.Presenter
View.ShowCancelRegInfo(new EnrollmentPatientModel().CancelRegInfo(args.ID));
};
View.DeleteOrder += (send, args) =>
-
{
View.ShowDeleteOrder(new EnrollmentPatientModel().DeleteOrder(args.ID));
};
diff --git a/PEIS/ReportFiles/体检基本信息登记表.xls b/PEIS/ReportFiles/体检基本信息登记表.xls
deleted file mode 100644
index e9678c4..0000000
Binary files a/PEIS/ReportFiles/体检基本信息登记表.xls and /dev/null differ
diff --git a/PEIS/ReportFiles/体检基本信息登记表1.0.xls b/PEIS/ReportFiles/体检基本信息登记表1.0.xls
deleted file mode 100644
index cc00851..0000000
Binary files a/PEIS/ReportFiles/体检基本信息登记表1.0.xls and /dev/null differ
diff --git a/PEIS/ReportFiles/医院体检人员信息收集样表.xlsx b/PEIS/ReportFiles/医院体检人员信息收集样表.xlsx
new file mode 100644
index 0000000..2369e0c
Binary files /dev/null and b/PEIS/ReportFiles/医院体检人员信息收集样表.xlsx differ
diff --git a/PEIS/ReportFiles/基本信息表.xls b/PEIS/ReportFiles/基本信息表.xls
deleted file mode 100644
index 55a7764..0000000
Binary files a/PEIS/ReportFiles/基本信息表.xls and /dev/null differ
diff --git a/PEIS/Utils/ExcelHelper.cs b/PEIS/Utils/ExcelHelper.cs
index f30adb3..ce1d20d 100644
--- a/PEIS/Utils/ExcelHelper.cs
+++ b/PEIS/Utils/ExcelHelper.cs
@@ -1,10 +1,10 @@
using System;
using System.Collections.Generic;
-using System.Globalization;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using NPOI.HSSF.UserModel;
+using NPOI.SS.UserModel;
using NPOI.XSSF.UserModel;
using PEIS.Entity;
@@ -12,9 +12,9 @@ namespace PEIS.Utils
{
public class ExcelHelper
{
-
+ private int StartRow = 4;
public List SuccessList = new List();
- public List ErrorList = new List();
+ public List ErrorList = new List();
public void ReadOrgPatientList()
{
try
@@ -24,17 +24,7 @@ namespace PEIS.Utils
dialog.Filter = @"Excel文件 (*.xls;*.xlsx)|*.xls;*.xlsx";
if (dialog.ShowDialog() != DialogResult.OK) return;
var excelFilePath = dialog.FileName;
- var fileExtension = Path.GetExtension(excelFilePath);
- switch (fileExtension)
- {
- case ".xls":
- ReadXLS(excelFilePath);
- break;
-
- case ".xlsx":
- ReadXLSX(excelFilePath);
- break;
- }
+ ReadExcelData(excelFilePath);
}
catch (Exception e)
{
@@ -42,215 +32,117 @@ namespace PEIS.Utils
Global.Msg("err", e.Message);
}
}
-
///
- /// 读取Excel XLS文件
+ /// 读取Excel文件
///
- ///
- public void ReadXLS(string excelFilePath)
+ /// 指定 .xlsx/.xls 文件的路径
+ public void ReadExcelData(string excelFilePath)
{
+ var fileExtension = Path.GetExtension(excelFilePath);
+ if (fileExtension != ".xls" && fileExtension != ".xlsx") return;
using (var fileStream = new FileStream(excelFilePath, FileMode.Open, FileAccess.Read))
{
-
- // 使用 HSSFWorkbook 打开 .xls 文件
- var workbook = new HSSFWorkbook(fileStream);
- // 选择工作表 第一个工作表
- var sheet = workbook.GetSheetAt(0);
- // 获取工作表的行数
- var rowCount = sheet.PhysicalNumberOfRows;
- int continuousEmpty = 0;
- // 遍历工作表并读取数据
- for (var row = 3; row < rowCount; row++)
+ var sheet = GetSheet(fileStream, fileExtension); // 第一个工作表
+ for (int startIndex = 0; startIndex < StartRow; startIndex++)
{
- if (continuousEmpty == 3)
- {
- break; // 如果连续三个错误，停止循环
- }
- var dataRow = sheet.GetRow(row);
-
- var name = dataRow.GetCell(0).ToString();
- var cardNo = dataRow.GetCell(4)?.ToString();
-
- if (string.IsNullOrEmpty(dataRow.GetCell(0).ToString())
- || !string.IsNullOrEmpty(cardNo) && cardNo.Length != 18
- || (cardNo?.Length == 18 && !DateTime.TryParseExact(cardNo.Substring(6, 8), "yyyyMMdd", null,
- DateTimeStyles.None, out _)))
- {
- continuousEmpty++;
- ErrorList.Add(new BasePatient()
- {
- ID = row,
- Name = dataRow.GetCell(0).ToString(),
- Sex = dataRow.GetCell(1).ToString(),
- Marriage = dataRow.GetCell(2).ToString(),
- Nation = dataRow.GetCell(3).ToString(),
- CardNo = dataRow.GetCell(4).ToString(),
- CardType = "居民身份证",
- Education = dataRow.GetCell(5).ToString(),
- Tel1 = dataRow.GetCell(6).ToString(),
- Address1 = dataRow.GetCell(7).ToString(),
- DeptName = dataRow.GetCell(8).ToString(),
- });
- continue;
- }
-
- SuccessList.Add(new BasePatient()
- {
- Name = name,
- Sex = dataRow.GetCell(1).ToString(),
- Marriage = dataRow.GetCell(2).ToString(),
- Nation = dataRow.GetCell(3).ToString(),
- CardNo = cardNo,
- CardType = "居民身份证",
- Education = dataRow.GetCell(5).ToString(),
- Tel1 = dataRow.GetCell(6).ToString(),
- Address1 = dataRow.GetCell(7).ToString(),
- DeptName = dataRow.GetCell(8).ToString(),
- });
- continuousEmpty = 0;
+ ErrorList.Add(new ExcelRowModel(startIndex, sheet.GetRow(startIndex)));
}
- };
- }
-
- ///
- /// 读取Excel XLSX文件
- ///
- /// 指定 .xlsx 文件的路径
- public void ReadXLSX(string excelFilePath)
- {
- using (var fileStream = new FileStream(excelFilePath, FileMode.Open, FileAccess.Read))
- {
- var workbook = new XSSFWorkbook(fileStream);
- var sheet = workbook.GetSheetAt(0); // 第一个工作表
-
// 获取工作表的行数和列数
var rowCount = sheet.PhysicalNumberOfRows;
-
int continuousEmpty = 0;
// 遍历工作表并读取数据
- for (var row = 2; row < rowCount; row++)
+ for (var row = StartRow; row < rowCount; row++)
{
- if (continuousEmpty == 3)
+ if (continuousEmpty == 5)
{
- break; // 如果连续三个错误，停止循环
+ break; // 如果连续5行错误，停止循环
}
var dataRow = sheet.GetRow(row);
- var name = dataRow.GetCell(0).ToString();
- var cardNo = dataRow.GetCell(4)?.ToString();
- if (string.IsNullOrEmpty(dataRow.GetCell(0).ToString()) || !string.IsNullOrEmpty(cardNo) && cardNo.Length != 18 || (cardNo?.Length == 18 && !DateTime.TryParseExact(cardNo.Substring(6, 8), "yyyyMMdd", null,
- DateTimeStyles.None, out _)))
+ var readPatient = ReadRowToBasePatient(dataRow);
+ var isBasePatient = readPatient.Validate();
+ if (!isBasePatient || SuccessList.Any(p => p.CardNo == readPatient.CardNo))
{
continuousEmpty++;
- ErrorList.Add(new BasePatient()
- {
- ID = row,
- Name = dataRow.GetCell(0).ToString(),
- Sex = dataRow.GetCell(1).ToString(),
- Marriage = dataRow.GetCell(2).ToString(),
- Nation = dataRow.GetCell(3).ToString(),
- CardNo = dataRow.GetCell(4).ToString(),
- CardType = "居民身份证",
- Education = dataRow.GetCell(5).ToString(),
- Tel1 = dataRow.GetCell(6).ToString(),
- Address1 = dataRow.GetCell(7).ToString(),
- DeptName = dataRow.GetCell(8).ToString(),
- });
+ ErrorList.Add(new ExcelRowModel(row, dataRow));
continue;
}
-
- SuccessList.Add(new BasePatient()
- {
- Name = name,
- Sex = dataRow.GetCell(1).ToString(),
- Marriage = dataRow.GetCell(2).ToString(),
- Nation = dataRow.GetCell(3).ToString(),
- CardNo = cardNo,
- CardType = "居民身份证",
- Education = dataRow.GetCell(5).ToString(),
- Tel1 = dataRow.GetCell(6).ToString(),
- Address1 = dataRow.GetCell(7).ToString(),
- DeptName = dataRow.GetCell(8).ToString(),
- });
+ SuccessList.Add(readPatient);
continuousEmpty = 0;
}
};
}
-
- // ///
- // /// 导出Excel
- // ///
- // ///
- // ///
- // ///
- // private MemoryStream ExportExcel(List list, string propertyStr)
- // {
- // var properties = propertyStr.Split(',').ToList();
- // using (var package = new ExcelPackage())
- // {
- // // 添加工作表
- // var worksheet = package.Workbook.Worksheets.Add($"{DateTime.Now:yyyyMMdd}");
- // // 将列名添加到第一行
- // for (var i = 0; i < properties.Count; i++)
- // {
- // if (Properties.ContainsKey(properties[i]))
- // worksheet.Cells[1, i + 1].Value = Properties[(properties[i])];
- // }
- // // 将数据写入单元格
- // for (var row = 0; row < list.Count; row++)
- // {
- // for (var col = 0; col < properties.Count; col++)
- // {
- // worksheet.Cells[row + 2, col + 1].Value = GetValueByPropertyNameHandle(list[row], properties[col]);
- // }
- // }
- // // 自动调整列宽
- // worksheet.Cells.AutoFitColumns();
- // // 保存文件到 MemoryStream
- // var memoryStream = new MemoryStream(package.GetAsByteArray());
- // // 设置流的位置为起始位置
- // memoryStream.Seek(0, SeekOrigin.Begin);
- // // 返回 Excel 文件
- // return memoryStream;
- // }
- // }
-
- ///
- /// 可选字段
- ///
- private static Dictionary Properties = new Dictionary()
+ private static ISheet GetSheet(FileStream fileStream, string fileExtension)
{
- {"Id", "id"},
- {"CriticalName", "项目名称"},
- {"CriticalCode", "项目代码"},
- {"CriticalValue", "危急值"},
- {"Description", "描述"},
- {"Unit", "单位"},
- };
+ if (fileExtension == ".xls")
+ return new HSSFWorkbook(fileStream).GetSheetAt(0);
-
- ///
- /// 根据属性名获取对象的属性值
- ///
- ///
- ///
- ///
- private string GetValueByPropertyNameHandle(EnrollmentPatient patient, string propertyName)
+ if (fileExtension == ".xlsx")
+ return new XSSFWorkbook(fileStream).GetSheetAt(0); // 第一个工作表
+ return null;
+ }
+ private static BasePatient ReadRowToBasePatient(IRow dataRow)
{
- switch (propertyName)
+ var sex = dataRow.GetCell(2)?.ToString()??"";
+ return new BasePatient()
{
- case "Id":
- return patient.ID.ToString();
- case "Name":
- return patient.Name;
- case "Age":
- return patient.Age + " " + patient.AgeClass;
- default:
- return "";
- }
+ // A-0-序号，B-1-姓名，C-2-性别，D-3-民族，E-4-婚姻，F-5-身份证号，G-6-住址，H-7-电话，I-8-部门，J-9备注
+ Name = dataRow.GetCell(1)?.ToString(),
+ Sex = sex.Contains("女")?"2":"1",
+ Nation = dataRow.GetCell(3)?.ToString(),
+ Marriage = dataRow.GetCell(4)?.ToString(),
+ CardNo = dataRow.GetCell(5)?.ToString(),
+ CardType = "居民身份证",
+ Address1 = dataRow.GetCell(6)?.ToString(),
+ Tel1 = dataRow.GetCell(7)?.ToString(),
+ DeptName = dataRow.GetCell(8)?.ToString(),
+ };
}
+ }
-}
+ public class ExcelRowModel
+ {
+ public int RowCount { get; set; }
+ public string ColumnA { get; set; }
+ public string ColumnB { get; set; }
+ public string ColumnC { get; set; }
+ public string ColumnD { get; set; }
+ public string ColumnE { get; set; }
+ public string ColumnF { get; set; }
+ public string ColumnG { get; set; }
+ public string ColumnH { get; set; }
+ public string ColumnI { get; set; }
+ public string ColumnJ { get; set; }
+ public ExcelRowModel()
+ {
+ }
+ public ExcelRowModel(int rowCount, IRow row)
+ {
+ RowCount = rowCount + 1;
+ ColumnA = row.GetCell(0)?.ToString()??"";
+ ColumnB = row.GetCell(1)?.ToString()??"";
+ ColumnC = row.GetCell(2)?.ToString()??"";
+ ColumnD = row.GetCell(3)?.ToString()??"";
+ ColumnE = row.GetCell(4)?.ToString()??"";
+ ColumnF = row.GetCell(5)?.ToString()??"";
+ ColumnG = row.GetCell(6)?.ToString()??"";
+ ColumnH = row.GetCell(7)?.ToString()??"";
+ ColumnI = row.GetCell(8)?.ToString()??"";
+ ColumnJ = row.GetCell(9)?.ToString()??"";
+ }
+ public ExcelRowModel(BasePatient p)
+ {
+ ColumnA = p.Name;
+ ColumnB = p.Sex;
+ ColumnC = p.Nation;
+ ColumnD = p.Marriage;
+ ColumnE = p.CardNo;
+ ColumnF = p.CardType;
+ ColumnG = p.Address1;
+ ColumnH = p.Tel1;
+ ColumnI = p.DeptName;
+ }
+ }
}
\ No newline at end of file
diff --git a/PEIS/View/Base/PatientImportForm.Designer.cs b/PEIS/View/Base/PatientImportForm.Designer.cs
index 87278ad..adf0993 100644
--- a/PEIS/View/Base/PatientImportForm.Designer.cs
+++ b/PEIS/View/Base/PatientImportForm.Designer.cs
@@ -65,15 +65,6 @@
this.DgcError = new DevExpress.XtraGrid.GridControl();
this.DgvError = new DevExpress.XtraGrid.Views.Grid.GridView();
this.colNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -90,6 +81,15 @@
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel2 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1.SuspendLayout();
this.OpsPatient.SuspendLayout();
@@ -582,133 +582,11 @@
// colNo
//
this.colNo.Caption = "Excel行号";
- this.colNo.FieldName = "id";
+ this.colNo.FieldName = "RowCount";
this.colNo.Name = "colNo";
this.colNo.Visible = true;
this.colNo.VisibleIndex = 0;
//
- // gridColumn7
- //
- this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.gridColumn7.AppearanceCell.Options.UseFont = true;
- this.gridColumn7.Caption = "姓名";
- this.gridColumn7.FieldName = "Name";
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.OptionsFilter.AllowFilter = false;
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
- this.gridColumn7.Width = 100;
- //
- // gridColumn8
- //
- this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.gridColumn8.AppearanceCell.Options.UseFont = true;
- this.gridColumn8.Caption = "性别";
- this.gridColumn8.FieldName = "Sex";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.OptionsFilter.AllowFilter = false;
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 2;
- this.gridColumn8.Width = 50;
- //
- // gridColumn14
- //
- this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.gridColumn14.AppearanceCell.Options.UseFont = true;
- this.gridColumn14.Caption = "婚况";
- this.gridColumn14.FieldName = "Marriage";
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn14.OptionsColumn.ReadOnly = true;
- this.gridColumn14.OptionsFilter.AllowFilter = false;
- this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 3;
- this.gridColumn14.Width = 60;
- //
- // gridColumn15
- //
- this.gridColumn15.Caption = "民族";
- this.gridColumn15.FieldName = "Nation";
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn15.OptionsColumn.ReadOnly = true;
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 4;
- this.gridColumn15.Width = 100;
- //
- // gridColumn16
- //
- this.gridColumn16.Caption = "身份证号";
- this.gridColumn16.FieldName = "CardNo";
- this.gridColumn16.Name = "gridColumn16";
- this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn16.OptionsColumn.ReadOnly = true;
- this.gridColumn16.OptionsFilter.AllowFilter = false;
- this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 5;
- this.gridColumn16.Width = 140;
- //
- // gridColumn17
- //
- this.gridColumn17.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.gridColumn17.AppearanceCell.Options.UseFont = true;
- this.gridColumn17.Caption = "教育程度";
- this.gridColumn17.FieldName = "Education";
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.OptionsColumn.AllowEdit = false;
- this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn17.OptionsColumn.ReadOnly = true;
- this.gridColumn17.OptionsFilter.AllowFilter = false;
- this.gridColumn17.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
- new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 6;
- this.gridColumn17.Width = 93;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "联系电话";
- this.gridColumn19.FieldName = "Tel1";
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn19.OptionsColumn.ReadOnly = true;
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 7;
- this.gridColumn19.Width = 100;
- //
- // gridColumn21
- //
- this.gridColumn21.Caption = "联系地址";
- this.gridColumn21.FieldName = "Address1";
- this.gridColumn21.MinWidth = 200;
- this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn21.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn21.OptionsColumn.ReadOnly = true;
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 8;
- this.gridColumn21.Width = 300;
- //
- // gridColumn27
- //
- this.gridColumn27.Caption = "部门";
- this.gridColumn27.FieldName = "DeptName";
- this.gridColumn27.Name = "gridColumn27";
- this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 9;
- this.gridColumn27.Width = 187;
- //
// repositoryItemComboBox1
//
this.repositoryItemComboBox1.AutoHeight = false;
@@ -877,18 +755,85 @@
this.label1.Text = "导入失败列表：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "A";
+ this.gridColumn7.FieldName = "ColumnA";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 1;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "B";
+ this.gridColumn8.FieldName = "ColumnB";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 2;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "C";
+ this.gridColumn14.FieldName = "ColumnC";
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 3;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "D";
+ this.gridColumn15.FieldName = "ColumnD";
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 4;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "E";
+ this.gridColumn16.FieldName = "ColumnE";
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 5;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "F";
+ this.gridColumn17.FieldName = "ColumnF";
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 6;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "G";
+ this.gridColumn19.FieldName = "ColumnG";
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 7;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "H";
+ this.gridColumn21.FieldName = "ColumnH";
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 8;
+ //
+ // gridColumn27
+ //
+ this.gridColumn27.Caption = "I";
+ this.gridColumn27.FieldName = "ColumnI";
+ this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.Visible = true;
+ this.gridColumn27.VisibleIndex = 9;
+ //
// gridColumn37
//
- this.gridColumn37.Caption = "失败原因";
- this.gridColumn37.FieldName = "ImportErrorInfo";
+ this.gridColumn37.Caption = "J";
+ this.gridColumn37.FieldName = "ColumnJ";
this.gridColumn37.Name = "gridColumn37";
- this.gridColumn37.OptionsColumn.AllowEdit = false;
- this.gridColumn37.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn37.OptionsColumn.ReadOnly = true;
- this.gridColumn37.OptionsFilter.AllowFilter = false;
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 10;
- this.gridColumn37.Width = 125;
//
// PatientImportForm
//
@@ -965,15 +910,6 @@
private DevExpress.XtraGrid.GridControl DgcError;
private DevExpress.XtraGrid.Views.Grid.GridView DgvError;
private DevExpress.XtraGrid.Columns.GridColumn colNo;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
@@ -990,6 +926,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
}
}
\ No newline at end of file
diff --git a/PEIS/View/Base/PatientImportForm.cs b/PEIS/View/Base/PatientImportForm.cs
index 6cb796e..b946734 100644
--- a/PEIS/View/Base/PatientImportForm.cs
+++ b/PEIS/View/Base/PatientImportForm.cs
@@ -14,11 +14,11 @@ namespace PEIS.View.Base
{
public partial class PatientImportForm : ViewBase
{
-
protected override object CreatePresenter()
{
return new Presenter(this);
}
+
private List _lstPatient = new List();
// 定义一个委托
@@ -44,18 +44,21 @@ namespace PEIS.View.Base
private void TsmiDown_Click(object sender, EventArgs e)
{
- var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "体检基本信息登记表.xls");
+ // var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "体检基本信息登记表.xls");
+ var file = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "医院体检人员信息收集样表.xlsx");
if (!File.Exists(file))
{
Global.MsgErr(@"未找到模板文件！");
return;
}
+
// 创建文件目标路径（用户选择的位置）
using (var folderDialog = new FolderBrowserDialog())
{
if (folderDialog.ShowDialog() != DialogResult.OK) return;
var targetFolderPath = folderDialog.SelectedPath;
- var targetFilePath = Path.Combine(targetFolderPath, "体检基本信息登记表.xls");
+ // var targetFilePath = Path.Combine(targetFolderPath, "体检基本信息登记表.xls");
+ var targetFilePath = Path.Combine(targetFolderPath, "医院体检人员信息收集样表.xlsx");
try
{
// 复制文件
@@ -83,100 +86,77 @@ namespace PEIS.View.Base
Global.MsgInfo($"数据为空，请导入数据！");
return;
}
+
int succeedCount = 0;
- var errorList = new List();
+ var errorList = new List();
_lstPatient = new List();
var createTime = DateTime.Now;
foreach (var item in _patients)
{
try
{
- var birthday = DateTime.Today;
- if (item.CardNo.Length == 18 && DateTime.TryParseExact(item.CardNo.Substring(6, 8), "yyyyMMdd", null,
- DateTimeStyles.None, out DateTime result))
- {
- birthday = result;
- }
-
- var basePatient = new BasePatient()
- {
- Name = item.Name?.Trim(),
- Sex = item.Sex == "女" ? "2" : "1",
- Nation = item.Nation,
- Birthday = birthday,
- CardType = "居民身份证",
- CardNo = item.CardNo,
- Marriage = item.Marriage,
- Occupation = item.Occupation,
- Education = item.Education,
- Contactor1 = item.Name,
- Contactor2 = item.Contactor2,
- Tel1 = item.Tel1,
- Tel2 = item.Tel2,
- Address1 = item.Address1,
- Address2 = item.Address2,
- Description = item.Description,
- CreateTime = createTime,
- Creator = Global.currentUser.Name,
- CreatorCode = Global.currentUser.Code
- };
-
+ var basePatient = item;
+ basePatient.CreateTime = createTime;
+ basePatient.Creator = Global.currentUser.Name;
+ basePatient.CreatorCode = Global.currentUser.Code;
if (!basePatient.Exits())
{
- // item.ImportErrorInfo = "身份证号已存在";
- // errorList.Add(item);
- // continue;
if (!basePatient.Save())
{
item.ImportErrorInfo = "信息保存失败";
- errorList.Add(item);
+ errorList.Add(new ExcelRowModel(item));
continue;
}
}
-
- succeedCount++;
- var sql = $@"SELECT ID,Name,Sex,CardNo, CardType, Birthday, Education, Nation, Tel1, Tel2,Marriage,Address1
+ succeedCount++;
+ var sql =
+ $@"SELECT ID,Name,Sex,CardNo, CardType, Birthday, Education, Nation, Tel1, Tel2,Marriage,Address1
FROM Base_Patient WHERE Name='{basePatient.Name}' AND CardNo = '{basePatient.CardNo}' ";
var add = (DAOHelp.GetDataBySQL(sql).FirstOrDefault());
- if (add != null)
- _lstPatient?.Add(new BaseOrgPatient
- {
- OID = _org.ID,
- PID = add.ID,
- Seq = _lstPatient.Count + 1,
- Name = add.Name,
- Sex = add.Sex == "1" ? "男" : "女",
- CardNo = add.CardNo,
- CardType = add.CardType,
- Birthday = add.Birthday,
- Education = add.Education,
- Nation = add.Nation,
- Tel1 = add.Tel1,
- Tel2 = add.Tel2,
- Marriage = add.Marriage,
- DeptName = item.DeptName,
- Address1 = add.Address1
- });
+ if (add == null)
+ {
+ errorList.Add(new ExcelRowModel(item));
+ continue;
+ }
+
+ _lstPatient?.Add(new BaseOrgPatient
+ {
+ OID = _org.ID,
+ PID = add.ID,
+ Seq = _lstPatient.Count + 1,
+ Name = add.Name,
+ Sex = add.Sex == "1" ? "男" : "女",
+ CardNo = add.CardNo,
+ CardType = add.CardType,
+ Birthday = add.Birthday,
+ Education = add.Education,
+ Nation = add.Nation,
+ Tel1 = add.Tel1,
+ Tel2 = add.Tel2,
+ Marriage = add.Marriage,
+ DeptName = item.DeptName,
+ Address1 = add.Address1
+ });
}
catch (Exception ex)
{
item.ImportErrorInfo = "错误：" + ex.Message;
- errorList.Add(item);
+ errorList.Add(new ExcelRowModel(item));
}
}
if (errorList.Count > 0)
{
- Global.MsgErr($"添加成功：{succeedCount}，添加失败：{ errorList.Count}。");
+ Global.MsgErr($"添加成功：{succeedCount}，添加失败：{errorList.Count}。");
DgcPatient.DataSource = null;
DgcError.DataSource = errorList;
}
else
{
- Global.MsgInfo($"添加成功！");
+ Global.MsgInfo($"添加成功：{succeedCount}！");
ImportFormClosed?.Invoke(_lstPatient);
Close();
}
@@ -191,10 +171,12 @@ FROM Base_Patient WHERE Name='{basePatient.Name}' AND CardNo = '{basePatient.Car
{
var excel = new ExcelHelper();
excel.ReadOrgPatientList();
- var list = excel.SuccessList.Where(p=>!string.IsNullOrEmpty(p.CardNo)).ToList().Distinct().ToList();
+ var list = excel.SuccessList;
_patients = list.Count > 0 ? list : new List();
+ label1.Text = "导入失败列表：" + $@"（已从Excel成功读取到 {excel.SuccessList.Count}行 数据）";
DgcPatient.DataSource = _patients;
DgcError.DataSource = excel.ErrorList.Distinct();
+ DgvError.BestFitColumns();
}
}
}
\ No newline at end of file
diff --git a/PEIS/View/Base/PersonForm.cs b/PEIS/View/Base/PersonForm.cs
index 948de71..0d7040a 100644
--- a/PEIS/View/Base/PersonForm.cs
+++ b/PEIS/View/Base/PersonForm.cs
@@ -1,12 +1,12 @@
- using PEIS.Base;
+using PEIS.Base;
using PEIS.Entity;
using PEIS.Event;
using PEIS.Presenter;
+using PEIS.Utils;
using System;
using System.Collections.Generic;
- using System.Linq;
- using System.Threading;
-using PEIS.Utils;
+using System.Threading;
+using System.Windows.Forms;
namespace PEIS.View.Base
{
@@ -29,11 +29,16 @@ namespace PEIS.View.Base
OpsPatient.TsmiDelete.Visible = false;
OpsPatient.TsmiSave.Visible = false;
OpsPatient.TsmiSearch.Visible = false;
- OpsPatient.TstbKey.TextChanged += Search_TextChanged;
+ OpsPatient.TstbKey.KeyDown += TstbKey_KeyDown;
DgvPatient.Initialize();
}
+ private void TstbKey_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter) OnGetBasePatient();
+ }
+
protected override object CreatePresenter()
{
return new BasePatientPresenter(this);
@@ -43,12 +48,6 @@ namespace PEIS.View.Base
{
ThreadPool.QueueUserWorkItem(state => OnGetBasePatient());
}
- private void Search_TextChanged(object sender, EventArgs e)
- {
- var search = OpsPatient.TstbKey.Text.Trim();
- if (search == @"输入条件查询") return;
- DgcPatient.SetDataSource(string.IsNullOrEmpty(search) ? _lstBasePatients : _lstBasePatients.Where(a => a.Name.Contains(search) || a.CardNo.Contains(search)).ToList());
- }
private void DgvPatient_CustomColumnDisplayText(object sender, DevExpress.XtraGrid.Views.Base.CustomColumnDisplayTextEventArgs e)
{
@@ -80,7 +79,7 @@ namespace PEIS.View.Base
}
protected virtual void OnGetBasePatient()
{
- GetBasePatient?.Invoke(this, new Args{});
+ GetBasePatient?.Invoke(this, new Args{ Code = OpsPatient.TstbKey.Text.Trim() == "输入条件查询" ? null : string.IsNullOrEmpty(OpsPatient.TstbKey.Text) ? null : OpsPatient.TstbKey.Text.Trim() });
}
#endregion
diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
index 5da75bf..1143ca5 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
@@ -34,6 +34,8 @@
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();
@@ -224,7 +226,7 @@
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();
@@ -255,6 +257,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();
@@ -325,6 +328,7 @@
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 +339,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 +378,7 @@
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();
+ this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@@ -474,6 +476,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;
@@ -487,20 +525,18 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(471, 1759);
+ this.panel1.Size = new System.Drawing.Size(236, 779);
this.panel1.TabIndex = 0;
//
// DgcOrg
//
this.DgcOrg.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(8);
- this.DgcOrg.Location = new System.Drawing.Point(0, 298);
+ this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.DgcOrg.Location = new System.Drawing.Point(0, 163);
this.DgcOrg.MainView = this.DgvOrg;
- this.DgcOrg.Margin = new System.Windows.Forms.Padding(6);
this.DgcOrg.Name = "DgcOrg";
- this.DgcOrg.Size = new System.Drawing.Size(471, 1461);
+ this.DgcOrg.Size = new System.Drawing.Size(236, 616);
this.DgcOrg.TabIndex = 127;
this.DgcOrg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvOrg});
@@ -695,9 +731,8 @@
this.panel2.Controls.Add(this.groupBox2);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(6);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(471, 298);
+ this.panel2.Size = new System.Drawing.Size(236, 163);
this.panel2.TabIndex = 0;
//
// groupBox2
@@ -712,10 +747,10 @@
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
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(471, 298);
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.groupBox2.Size = new System.Drawing.Size(236, 163);
this.groupBox2.TabIndex = 131;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "快速查询";
@@ -724,19 +759,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, 43);
- this.NameSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.NameSearch.Location = new System.Drawing.Point(63, 24);
+ 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 = 133;
//
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(8, 45);
- this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label16.Location = new System.Drawing.Point(4, 25);
+ 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 = 132;
this.label16.Text = "模糊检索";
//
@@ -752,10 +787,10 @@
this.toolStripMenuItem10,
this.TsmiOrgAdd});
this.menuStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
- this.menuStrip2.Location = new System.Drawing.Point(5, 251);
+ this.menuStrip2.Location = new System.Drawing.Point(2, 126);
this.menuStrip2.Name = "menuStrip2";
- this.menuStrip2.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3);
- this.menuStrip2.Size = new System.Drawing.Size(461, 41);
+ this.menuStrip2.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
+ this.menuStrip2.Size = new System.Drawing.Size(232, 34);
this.menuStrip2.TabIndex = 131;
this.menuStrip2.Text = "menuStrip2";
//
@@ -765,13 +800,13 @@
this.TsmiOrgRefresh.Image = global::PEIS.Properties.Resources.刷新;
this.TsmiOrgRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiOrgRefresh.Name = "TsmiOrgRefresh";
- this.TsmiOrgRefresh.Size = new System.Drawing.Size(100, 35);
+ this.TsmiOrgRefresh.Size = new System.Drawing.Size(70, 30);
this.TsmiOrgRefresh.Text = "刷新";
//
// toolStripMenuItem10
//
this.toolStripMenuItem10.Name = "toolStripMenuItem10";
- this.toolStripMenuItem10.Size = new System.Drawing.Size(33, 35);
+ this.toolStripMenuItem10.Size = new System.Drawing.Size(24, 30);
this.toolStripMenuItem10.Text = " ";
//
// TsmiOrgAdd
@@ -780,16 +815,16 @@
this.TsmiOrgAdd.Image = global::PEIS.Properties.Resources.添加;
this.TsmiOrgAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiOrgAdd.Name = "TsmiOrgAdd";
- this.TsmiOrgAdd.Size = new System.Drawing.Size(100, 35);
+ this.TsmiOrgAdd.Size = new System.Drawing.Size(70, 30);
this.TsmiOrgAdd.Text = "登记";
//
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(8, 188);
- this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label19.Location = new System.Drawing.Point(4, 103);
+ 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 = "终止日期";
//
@@ -799,10 +834,10 @@
this.DtpEndDate.CustomFormat = " yyyy 年 MM 月 dd 日";
this.DtpEndDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.DtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.DtpEndDate.Location = new System.Drawing.Point(126, 180);
- this.DtpEndDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.DtpEndDate.Location = new System.Drawing.Point(63, 99);
+ this.DtpEndDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DtpEndDate.Name = "DtpEndDate";
- this.DtpEndDate.Size = new System.Drawing.Size(304, 39);
+ this.DtpEndDate.Size = new System.Drawing.Size(154, 23);
this.DtpEndDate.TabIndex = 62;
this.DtpEndDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0);
//
@@ -812,41 +847,40 @@
this.DtpBegDate.CustomFormat = " yyyy 年 MM 月 dd 日";
this.DtpBegDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.DtpBegDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.DtpBegDate.Location = new System.Drawing.Point(126, 112);
- this.DtpBegDate.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.DtpBegDate.Location = new System.Drawing.Point(63, 61);
+ this.DtpBegDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DtpBegDate.Name = "DtpBegDate";
- this.DtpBegDate.Size = new System.Drawing.Size(304, 39);
+ this.DtpBegDate.Size = new System.Drawing.Size(154, 23);
this.DtpBegDate.TabIndex = 61;
this.DtpBegDate.Value = new System.DateTime(2023, 9, 12, 0, 0, 0, 0);
//
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(8, 121);
- this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label15.Location = new System.Drawing.Point(4, 66);
+ 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 = "起始日期";
//
// splitter1
//
this.splitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
- this.splitter1.Location = new System.Drawing.Point(471, 0);
- this.splitter1.Margin = new System.Windows.Forms.Padding(2);
+ this.splitter1.Location = new System.Drawing.Point(236, 0);
+ this.splitter1.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter1.Name = "splitter1";
- this.splitter1.Size = new System.Drawing.Size(8, 1759);
+ this.splitter1.Size = new System.Drawing.Size(4, 779);
this.splitter1.TabIndex = 1;
this.splitter1.TabStop = false;
//
// TcOrg
//
this.TcOrg.Dock = System.Windows.Forms.DockStyle.Fill;
- this.TcOrg.Location = new System.Drawing.Point(479, 0);
- this.TcOrg.Margin = new System.Windows.Forms.Padding(6);
+ this.TcOrg.Location = new System.Drawing.Point(240, 0);
this.TcOrg.Name = "TcOrg";
this.TcOrg.SelectedTabPage = this.TpGroup;
- this.TcOrg.Size = new System.Drawing.Size(2405, 1759);
+ this.TcOrg.Size = new System.Drawing.Size(1202, 779);
this.TcOrg.TabIndex = 35;
this.TcOrg.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.TpGroup,
@@ -862,19 +896,17 @@
this.TpGroup.Controls.Add(this.DgcGroup);
this.TpGroup.Controls.Add(this.panel3);
this.TpGroup.Image = global::PEIS.Properties.Resources.套餐;
- this.TpGroup.Margin = new System.Windows.Forms.Padding(6);
this.TpGroup.Name = "TpGroup";
- this.TpGroup.Size = new System.Drawing.Size(2393, 1702);
+ this.TpGroup.Size = new System.Drawing.Size(1196, 736);
this.TpGroup.Text = "团体分组";
//
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 344);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(6);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 189);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1316, 1358);
+ this.xtraTabControl1.Size = new System.Drawing.Size(658, 547);
this.xtraTabControl1.TabIndex = 131;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -882,23 +914,20 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.DgcGroupPatient);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(6);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1304, 1301);
+ this.xtraTabPage1.Size = new System.Drawing.Size(652, 518);
this.xtraTabPage1.Text = "已分组成员";
//
// DgcGroupPatient
//
this.DgcGroupPatient.ContextMenuStrip = this.contextMenuStrip1;
this.DgcGroupPatient.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcGroupPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
this.DgcGroupPatient.Location = new System.Drawing.Point(0, 0);
this.DgcGroupPatient.MainView = this.DgvGroupPatient;
- this.DgcGroupPatient.Margin = new System.Windows.Forms.Padding(6);
this.DgcGroupPatient.Name = "DgcGroupPatient";
this.DgcGroupPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemImageEdit2});
- this.DgcGroupPatient.Size = new System.Drawing.Size(1304, 1301);
+ this.DgcGroupPatient.Size = new System.Drawing.Size(652, 518);
this.DgcGroupPatient.TabIndex = 132;
this.DgcGroupPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvGroupPatient});
@@ -909,13 +938,13 @@
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FastGroupMove});
this.contextMenuStrip1.Name = "CostFastMenu";
- this.contextMenuStrip1.Size = new System.Drawing.Size(185, 40);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26);
//
// FastGroupMove
//
this.FastGroupMove.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.FastGroupMove.Name = "FastGroupMove";
- this.FastGroupMove.Size = new System.Drawing.Size(184, 36);
+ this.FastGroupMove.Size = new System.Drawing.Size(124, 22);
this.FastGroupMove.Text = "批量移除";
//
// DgvGroupPatient
@@ -1229,21 +1258,20 @@
//
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(1316, 344);
- this.splitter3.Margin = new System.Windows.Forms.Padding(2);
+ this.splitter3.Location = new System.Drawing.Point(658, 189);
+ this.splitter3.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter3.Name = "splitter3";
- this.splitter3.Size = new System.Drawing.Size(8, 1358);
+ this.splitter3.Size = new System.Drawing.Size(4, 547);
this.splitter3.TabIndex = 135;
this.splitter3.TabStop = false;
//
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Right;
- this.xtraTabControl2.Location = new System.Drawing.Point(1324, 344);
- this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(6);
+ this.xtraTabControl2.Location = new System.Drawing.Point(662, 189);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.xtraTabPage3;
- this.xtraTabControl2.Size = new System.Drawing.Size(1069, 1358);
+ this.xtraTabControl2.Size = new System.Drawing.Size(534, 547);
this.xtraTabControl2.TabIndex = 134;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage3});
@@ -1252,22 +1280,19 @@
//
this.xtraTabPage3.Controls.Add(this.DgcPatient);
this.xtraTabPage3.Controls.Add(this.panel10);
- this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(6);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1057, 1301);
+ this.xtraTabPage3.Size = new System.Drawing.Size(528, 518);
this.xtraTabPage3.Text = "未分组成员";
//
// DgcPatient
//
this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcPatient.Location = new System.Drawing.Point(0, 68);
+ this.DgcPatient.Location = new System.Drawing.Point(0, 37);
this.DgcPatient.MainView = this.DgvPatient;
- this.DgcPatient.Margin = new System.Windows.Forms.Padding(6);
this.DgcPatient.Name = "DgcPatient";
this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemImageEdit1});
- this.DgcPatient.Size = new System.Drawing.Size(1057, 1233);
+ this.DgcPatient.Size = new System.Drawing.Size(528, 481);
this.DgcPatient.TabIndex = 133;
this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPatient});
@@ -1585,19 +1610,17 @@
this.panel10.Controls.Add(this.RbAll);
this.panel10.Dock = System.Windows.Forms.DockStyle.Top;
this.panel10.Location = new System.Drawing.Point(0, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(1057, 68);
+ this.panel10.Size = new System.Drawing.Size(528, 37);
this.panel10.TabIndex = 132;
//
// ImportBtn
//
this.ImportBtn.AutoSize = true;
this.ImportBtn.Image = ((System.Drawing.Image)(resources.GetObject("ImportBtn.Image")));
- this.ImportBtn.Location = new System.Drawing.Point(812, 3);
- this.ImportBtn.Margin = new System.Windows.Forms.Padding(6);
+ this.ImportBtn.Location = new System.Drawing.Point(406, 2);
this.ImportBtn.Name = "ImportBtn";
- this.ImportBtn.Size = new System.Drawing.Size(222, 60);
+ this.ImportBtn.Size = new System.Drawing.Size(111, 33);
this.ImportBtn.TabIndex = 5;
this.ImportBtn.Text = "全部导入";
this.ImportBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
@@ -1608,10 +1631,9 @@
//
this.NewBaseBtn.AutoSize = true;
this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加;
- this.NewBaseBtn.Location = new System.Drawing.Point(568, 3);
- this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(6);
+ this.NewBaseBtn.Location = new System.Drawing.Point(284, 2);
this.NewBaseBtn.Name = "NewBaseBtn";
- this.NewBaseBtn.Size = new System.Drawing.Size(226, 60);
+ this.NewBaseBtn.Size = new System.Drawing.Size(113, 33);
this.NewBaseBtn.TabIndex = 4;
this.NewBaseBtn.Text = "新增成员";
this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
@@ -1620,10 +1642,9 @@
// RbFit
//
this.RbFit.AutoSize = true;
- this.RbFit.Location = new System.Drawing.Point(264, 14);
- this.RbFit.Margin = new System.Windows.Forms.Padding(6);
+ this.RbFit.Location = new System.Drawing.Point(132, 8);
this.RbFit.Name = "RbFit";
- this.RbFit.Size = new System.Drawing.Size(260, 33);
+ this.RbFit.Size = new System.Drawing.Size(133, 18);
this.RbFit.TabIndex = 3;
this.RbFit.TabStop = true;
this.RbFit.Text = "符合条件未分组成员";
@@ -1633,10 +1654,9 @@
//
this.RbAll.AutoSize = true;
this.RbAll.Checked = true;
- this.RbAll.Location = new System.Drawing.Point(14, 14);
- this.RbAll.Margin = new System.Windows.Forms.Padding(6);
+ this.RbAll.Location = new System.Drawing.Point(7, 8);
this.RbAll.Name = "RbAll";
- this.RbAll.Size = new System.Drawing.Size(212, 33);
+ this.RbAll.Size = new System.Drawing.Size(109, 18);
this.RbAll.TabIndex = 2;
this.RbAll.TabStop = true;
this.RbAll.Text = "所有未分组成员";
@@ -1646,26 +1666,24 @@
//
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, 335);
- this.splitter2.Margin = new System.Windows.Forms.Padding(2);
+ this.splitter2.Location = new System.Drawing.Point(0, 184);
+ this.splitter2.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter2.Name = "splitter2";
- this.splitter2.Size = new System.Drawing.Size(2393, 9);
+ this.splitter2.Size = new System.Drawing.Size(1196, 5);
this.splitter2.TabIndex = 132;
this.splitter2.TabStop = false;
//
// DgcGroup
//
this.DgcGroup.Dock = System.Windows.Forms.DockStyle.Top;
- this.DgcGroup.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcGroup.Location = new System.Drawing.Point(0, 76);
+ this.DgcGroup.Location = new System.Drawing.Point(0, 42);
this.DgcGroup.MainView = this.DgvGroup;
- this.DgcGroup.Margin = new System.Windows.Forms.Padding(6);
this.DgcGroup.Name = "DgcGroup";
this.DgcGroup.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.RiCmbSex,
this.RiCmbMarriage,
this.RiCmbExamType});
- this.DgcGroup.Size = new System.Drawing.Size(2393, 259);
+ this.DgcGroup.Size = new System.Drawing.Size(1196, 142);
this.DgcGroup.TabIndex = 130;
this.DgcGroup.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvGroup});
@@ -1871,18 +1889,17 @@
this.panel3.Controls.Add(this.OpsGroup);
this.panel3.Dock = System.Windows.Forms.DockStyle.Top;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(6);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(2393, 76);
+ this.panel3.Size = new System.Drawing.Size(1196, 42);
this.panel3.TabIndex = 129;
//
// OpsGroup
//
this.OpsGroup.Dock = System.Windows.Forms.DockStyle.Fill;
this.OpsGroup.Location = new System.Drawing.Point(0, 0);
- this.OpsGroup.Margin = new System.Windows.Forms.Padding(6, 9, 6, 9);
+ this.OpsGroup.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.OpsGroup.Name = "OpsGroup";
- this.OpsGroup.Size = new System.Drawing.Size(2393, 76);
+ this.OpsGroup.Size = new System.Drawing.Size(1196, 42);
this.OpsGroup.TabIndex = 2;
//
// TpGroupFeeItem
@@ -1891,9 +1908,8 @@
this.TpGroupFeeItem.Controls.Add(this.DgcGroup2);
this.TpGroupFeeItem.Controls.Add(this.panel4);
this.TpGroupFeeItem.Image = global::PEIS.Properties.Resources.收费项目;
- this.TpGroupFeeItem.Margin = new System.Windows.Forms.Padding(6);
this.TpGroupFeeItem.Name = "TpGroupFeeItem";
- this.TpGroupFeeItem.Size = new System.Drawing.Size(2393, 1702);
+ this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 922);
this.TpGroupFeeItem.Text = "分组项目";
//
// panel5
@@ -1903,23 +1919,21 @@
this.panel5.Controls.Add(this.panel9);
this.panel5.Controls.Add(this.splitter8);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel5.Location = new System.Drawing.Point(0, 351);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ 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(2393, 1351);
+ this.panel5.Size = new System.Drawing.Size(1196, 730);
this.panel5.TabIndex = 139;
//
// DgcGroupFeeItem
//
this.DgcGroupFeeItem.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcGroupFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcGroupFeeItem.Location = new System.Drawing.Point(0, 9);
+ this.DgcGroupFeeItem.Location = new System.Drawing.Point(0, 5);
this.DgcGroupFeeItem.MainView = this.DgvGroupFeeItem;
- this.DgcGroupFeeItem.Margin = new System.Windows.Forms.Padding(6);
this.DgcGroupFeeItem.Name = "DgcGroupFeeItem";
this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit1});
- this.DgcGroupFeeItem.Size = new System.Drawing.Size(1466, 1342);
+ this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 725);
this.DgcGroupFeeItem.TabIndex = 137;
this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvGroupFeeItem});
@@ -2117,10 +2131,9 @@
//
this.splitter4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter4.Dock = System.Windows.Forms.DockStyle.Right;
- this.splitter4.Location = new System.Drawing.Point(1466, 9);
- this.splitter4.Margin = new System.Windows.Forms.Padding(6);
+ this.splitter4.Location = new System.Drawing.Point(732, 5);
this.splitter4.Name = "splitter4";
- this.splitter4.Size = new System.Drawing.Size(8, 1342);
+ this.splitter4.Size = new System.Drawing.Size(4, 725);
this.splitter4.TabIndex = 142;
this.splitter4.TabStop = false;
//
@@ -2128,10 +2141,10 @@
//
this.panel9.Controls.Add(this.tabControl1);
this.panel9.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel9.Location = new System.Drawing.Point(1474, 9);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ 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(919, 1342);
+ this.panel9.Size = new System.Drawing.Size(460, 725);
this.panel9.TabIndex = 141;
//
// tabControl1
@@ -2140,20 +2153,20 @@
this.tabControl1.Controls.Add(this.TpFeeItem);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Location = new System.Drawing.Point(0, 0);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ 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(919, 1342);
+ this.tabControl1.Size = new System.Drawing.Size(460, 725);
this.tabControl1.TabIndex = 139;
//
// TpPack
//
this.TpPack.Controls.Add(this.DgcPack);
- this.TpPack.Location = new System.Drawing.Point(8, 43);
- this.TpPack.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.TpPack.Location = new System.Drawing.Point(4, 24);
+ this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpPack.Name = "TpPack";
- this.TpPack.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.TpPack.Size = new System.Drawing.Size(903, 1291);
+ this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.TpPack.Size = new System.Drawing.Size(452, 708);
this.TpPack.TabIndex = 1;
this.TpPack.Text = "套餐";
this.TpPack.UseVisualStyleBackColor = true;
@@ -2161,12 +2174,10 @@
// 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.Size = new System.Drawing.Size(893, 1279);
+ this.DgcPack.Size = new System.Drawing.Size(448, 702);
this.DgcPack.TabIndex = 122;
this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPack,
@@ -2327,11 +2338,11 @@
//
this.TpFeeItem.Controls.Add(this.DgcFeeItem);
this.TpFeeItem.Controls.Add(this.FeeItemSearch);
- this.TpFeeItem.Location = new System.Drawing.Point(8, 43);
- this.TpFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.TpFeeItem.Location = new System.Drawing.Point(4, 24);
+ this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpFeeItem.Name = "TpFeeItem";
- this.TpFeeItem.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.TpFeeItem.Size = new System.Drawing.Size(903, 1291);
+ this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.TpFeeItem.Size = new System.Drawing.Size(452, 708);
this.TpFeeItem.TabIndex = 0;
this.TpFeeItem.Text = "收费项目";
this.TpFeeItem.UseVisualStyleBackColor = true;
@@ -2339,14 +2350,12 @@
// 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, 42);
+ this.DgcFeeItem.Location = new System.Drawing.Point(2, 25);
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(893, 1243);
+ this.DgcFeeItem.Size = new System.Drawing.Size(448, 680);
this.DgcFeeItem.TabIndex = 137;
this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvFeeItem,
@@ -2520,10 +2529,10 @@
// 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(893, 36);
+ this.FeeItemSearch.Size = new System.Drawing.Size(448, 22);
this.FeeItemSearch.TabIndex = 136;
//
// splitter8
@@ -2531,25 +2540,22 @@
this.splitter8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter8.Dock = System.Windows.Forms.DockStyle.Top;
this.splitter8.Location = new System.Drawing.Point(0, 0);
- this.splitter8.Margin = new System.Windows.Forms.Padding(6);
this.splitter8.Name = "splitter8";
- this.splitter8.Size = new System.Drawing.Size(2393, 9);
+ this.splitter8.Size = new System.Drawing.Size(1196, 5);
this.splitter8.TabIndex = 140;
this.splitter8.TabStop = false;
//
// DgcGroup2
//
this.DgcGroup2.Dock = System.Windows.Forms.DockStyle.Top;
- this.DgcGroup2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcGroup2.Location = new System.Drawing.Point(0, 81);
+ this.DgcGroup2.Location = new System.Drawing.Point(0, 44);
this.DgcGroup2.MainView = this.DgvGroup2;
- this.DgcGroup2.Margin = new System.Windows.Forms.Padding(6);
this.DgcGroup2.Name = "DgcGroup2";
this.DgcGroup2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemComboBox1,
this.repositoryItemComboBox2,
this.repositoryItemComboBox3});
- this.DgcGroup2.Size = new System.Drawing.Size(2393, 270);
+ this.DgcGroup2.Size = new System.Drawing.Size(1196, 148);
this.DgcGroup2.TabIndex = 142;
this.DgcGroup2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvGroup2});
@@ -2776,9 +2782,9 @@
this.panel4.Controls.Add(this.BtnApplyGroupFeeItem);
this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
this.panel4.Location = new System.Drawing.Point(0, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.panel4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2393, 81);
+ this.panel4.Size = new System.Drawing.Size(1196, 44);
this.panel4.TabIndex = 141;
//
// BtnApplyGroupFeeItem
@@ -2790,10 +2796,9 @@
this.BtnApplyGroupFeeItem.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BtnApplyGroupFeeItem.Image = global::PEIS.Properties.Resources.添加;
this.BtnApplyGroupFeeItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.BtnApplyGroupFeeItem.Location = new System.Drawing.Point(2027, 0);
- this.BtnApplyGroupFeeItem.Margin = new System.Windows.Forms.Padding(6);
+ this.BtnApplyGroupFeeItem.Location = new System.Drawing.Point(1013, 0);
this.BtnApplyGroupFeeItem.Name = "BtnApplyGroupFeeItem";
- this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(366, 81);
+ this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(183, 44);
this.BtnApplyGroupFeeItem.TabIndex = 34;
this.BtnApplyGroupFeeItem.Text = "应用收费模板到团体成员";
this.BtnApplyGroupFeeItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -2806,9 +2811,8 @@
this.TpPerson.Controls.Add(this.splitterControl1);
this.TpPerson.Controls.Add(this.panel11);
this.TpPerson.Image = global::PEIS.Properties.Resources.个人信息__1_;
- this.TpPerson.Margin = new System.Windows.Forms.Padding(6);
this.TpPerson.Name = "TpPerson";
- this.TpPerson.Size = new System.Drawing.Size(2393, 1702);
+ this.TpPerson.Size = new System.Drawing.Size(1196, 736);
this.TpPerson.Text = "团体成员收费";
//
// panel6
@@ -2819,30 +2823,29 @@
this.panel6.Controls.Add(this.splitter5);
this.panel6.Controls.Add(this.panel8);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel6.Location = new System.Drawing.Point(570, 75);
- this.panel6.Margin = new System.Windows.Forms.Padding(6);
+ this.panel6.Location = new System.Drawing.Point(285, 42);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1823, 1627);
+ this.panel6.Size = new System.Drawing.Size(911, 694);
this.panel6.TabIndex = 147;
//
// panel13
//
this.panel13.Controls.Add(this.xtraTabControl4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel13.Location = new System.Drawing.Point(1111, 720);
- this.panel13.Margin = new System.Windows.Forms.Padding(5);
+ this.panel13.Location = new System.Drawing.Point(555, 394);
+ this.panel13.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(712, 907);
+ this.panel13.Size = new System.Drawing.Size(356, 300);
this.panel13.TabIndex = 155;
//
// xtraTabControl4
//
this.xtraTabControl4.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl4.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl4.Margin = new System.Windows.Forms.Padding(5);
+ this.xtraTabControl4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabControl4.Name = "xtraTabControl4";
this.xtraTabControl4.SelectedTabPage = this.xtraTabPage4;
- this.xtraTabControl4.Size = new System.Drawing.Size(712, 907);
+ this.xtraTabControl4.Size = new System.Drawing.Size(356, 300);
this.xtraTabControl4.TabIndex = 1;
this.xtraTabControl4.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage4});
@@ -2850,23 +2853,21 @@
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.DgcCheckCost2);
- this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(5);
+ this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(700, 850);
+ this.xtraTabPage4.Size = new System.Drawing.Size(350, 271);
this.xtraTabPage4.Text = "个人订单";
//
// DgcCheckCost2
//
this.DgcCheckCost2.ContextMenuStrip = this.PersonCostFastMenu;
this.DgcCheckCost2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcCheckCost2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
this.DgcCheckCost2.Location = new System.Drawing.Point(0, 0);
this.DgcCheckCost2.MainView = this.DgvCheckCost2;
- this.DgcCheckCost2.Margin = new System.Windows.Forms.Padding(6);
this.DgcCheckCost2.Name = "DgcCheckCost2";
this.DgcCheckCost2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit2});
- this.DgcCheckCost2.Size = new System.Drawing.Size(700, 850);
+ this.DgcCheckCost2.Size = new System.Drawing.Size(350, 271);
this.DgcCheckCost2.TabIndex = 148;
this.DgcCheckCost2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvCheckCost2});
@@ -2884,20 +2885,20 @@
this.toolStripMenuItem15,
this.PFastRefreshCost});
this.PersonCostFastMenu.Name = "CostFastMenu";
- this.PersonCostFastMenu.Size = new System.Drawing.Size(245, 292);
+ this.PersonCostFastMenu.Size = new System.Drawing.Size(161, 276);
//
// PFastCharge
//
this.PFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCharge.Image")));
this.PFastCharge.Name = "PFastCharge";
- this.PFastCharge.Size = new System.Drawing.Size(244, 36);
+ this.PFastCharge.Size = new System.Drawing.Size(160, 34);
this.PFastCharge.Text = "记账";
//
// PFastAllCharge
//
this.PFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastAllCharge.Image")));
this.PFastAllCharge.Name = "PFastAllCharge";
- this.PFastAllCharge.Size = new System.Drawing.Size(244, 36);
+ this.PFastAllCharge.Size = new System.Drawing.Size(160, 34);
this.PFastAllCharge.Text = "全部记账";
//
// PFastDeleteCost
@@ -2905,7 +2906,7 @@
this.PFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("PFastDeleteCost.Image")));
this.PFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PFastDeleteCost.Name = "PFastDeleteCost";
- this.PFastDeleteCost.Size = new System.Drawing.Size(244, 36);
+ this.PFastDeleteCost.Size = new System.Drawing.Size(160, 34);
this.PFastDeleteCost.Text = "删除订单";
//
// PFastCancelCharge
@@ -2913,7 +2914,7 @@
this.PFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCancelCharge.Image")));
this.PFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PFastCancelCharge.Name = "PFastCancelCharge";
- this.PFastCancelCharge.Size = new System.Drawing.Size(244, 36);
+ this.PFastCancelCharge.Size = new System.Drawing.Size(160, 34);
this.PFastCancelCharge.Text = "取消记账";
//
// PFastChangeCost
@@ -2921,20 +2922,20 @@
this.PFastChangeCost.Image = global::PEIS.Properties.Resources.刷新;
this.PFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PFastChangeCost.Name = "PFastChangeCost";
- this.PFastChangeCost.Size = new System.Drawing.Size(244, 36);
+ this.PFastChangeCost.Size = new System.Drawing.Size(160, 34);
this.PFastChangeCost.Text = "订单转换";
//
// toolStripMenuItem14
//
this.toolStripMenuItem14.Name = "toolStripMenuItem14";
- this.toolStripMenuItem14.Size = new System.Drawing.Size(244, 36);
+ this.toolStripMenuItem14.Size = new System.Drawing.Size(160, 34);
this.toolStripMenuItem14.Text = "全部删除订单";
this.toolStripMenuItem14.Visible = false;
//
// toolStripMenuItem15
//
this.toolStripMenuItem15.Name = "toolStripMenuItem15";
- this.toolStripMenuItem15.Size = new System.Drawing.Size(244, 36);
+ this.toolStripMenuItem15.Size = new System.Drawing.Size(160, 34);
this.toolStripMenuItem15.Text = "全部取消记账";
this.toolStripMenuItem15.Visible = false;
//
@@ -2943,7 +2944,7 @@
this.PFastRefreshCost.Image = global::PEIS.Properties.Resources.刷新;
this.PFastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.PFastRefreshCost.Name = "PFastRefreshCost";
- this.PFastRefreshCost.Size = new System.Drawing.Size(244, 36);
+ this.PFastRefreshCost.Size = new System.Drawing.Size(160, 34);
this.PFastRefreshCost.Text = "刷新订单";
this.PFastRefreshCost.Visible = false;
//
@@ -2975,6 +2976,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 +3250,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
//
@@ -3276,10 +3276,10 @@
// splitter6
//
this.splitter6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
- this.splitter6.Location = new System.Drawing.Point(1101, 720);
- this.splitter6.Margin = new System.Windows.Forms.Padding(5);
+ this.splitter6.Location = new System.Drawing.Point(550, 394);
+ this.splitter6.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.splitter6.Name = "splitter6";
- this.splitter6.Size = new System.Drawing.Size(10, 907);
+ this.splitter6.Size = new System.Drawing.Size(5, 300);
this.splitter6.TabIndex = 154;
this.splitter6.TabStop = false;
//
@@ -3287,20 +3287,20 @@
//
this.panel12.Controls.Add(this.xtraTabControl3);
this.panel12.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel12.Location = new System.Drawing.Point(0, 720);
- this.panel12.Margin = new System.Windows.Forms.Padding(5);
+ this.panel12.Location = new System.Drawing.Point(0, 394);
+ this.panel12.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1101, 907);
+ this.panel12.Size = new System.Drawing.Size(550, 300);
this.panel12.TabIndex = 153;
//
// xtraTabControl3
//
this.xtraTabControl3.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl3.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl3.Margin = new System.Windows.Forms.Padding(5);
+ this.xtraTabControl3.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabControl3.Name = "xtraTabControl3";
this.xtraTabControl3.SelectedTabPage = this.xtraTabPage2;
- this.xtraTabControl3.Size = new System.Drawing.Size(1101, 907);
+ this.xtraTabControl3.Size = new System.Drawing.Size(550, 300);
this.xtraTabControl3.TabIndex = 0;
this.xtraTabControl3.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage2});
@@ -3308,23 +3308,21 @@
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.DgcCheckCost);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(5);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1089, 850);
+ this.xtraTabPage2.Size = new System.Drawing.Size(544, 271);
this.xtraTabPage2.Text = "团体订单";
//
// DgcCheckCost
//
this.DgcCheckCost.ContextMenuStrip = this.TeamCostFastMenu;
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(1089, 850);
+ this.DgcCheckCost.Size = new System.Drawing.Size(544, 271);
this.DgcCheckCost.TabIndex = 147;
this.DgcCheckCost.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvCheckCost});
@@ -3341,20 +3339,20 @@
this.TFastAllDeleteCost,
this.TFastAllCancelCharge});
this.TeamCostFastMenu.Name = "CostFastMenu";
- this.TeamCostFastMenu.Size = new System.Drawing.Size(245, 256);
+ this.TeamCostFastMenu.Size = new System.Drawing.Size(161, 242);
//
// TFastCharge
//
this.TFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCharge.Image")));
this.TFastCharge.Name = "TFastCharge";
- this.TFastCharge.Size = new System.Drawing.Size(244, 36);
+ this.TFastCharge.Size = new System.Drawing.Size(160, 34);
this.TFastCharge.Text = "记账";
//
// TFastAllCharge
//
this.TFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastAllCharge.Image")));
this.TFastAllCharge.Name = "TFastAllCharge";
- this.TFastAllCharge.Size = new System.Drawing.Size(244, 36);
+ this.TFastAllCharge.Size = new System.Drawing.Size(160, 34);
this.TFastAllCharge.Text = "全部记账";
//
// TFastDeleteCost
@@ -3362,7 +3360,7 @@
this.TFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("TFastDeleteCost.Image")));
this.TFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TFastDeleteCost.Name = "TFastDeleteCost";
- this.TFastDeleteCost.Size = new System.Drawing.Size(244, 36);
+ this.TFastDeleteCost.Size = new System.Drawing.Size(160, 34);
this.TFastDeleteCost.Text = "删除订单";
//
// TFastCancelCharge
@@ -3370,7 +3368,7 @@
this.TFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCancelCharge.Image")));
this.TFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TFastCancelCharge.Name = "TFastCancelCharge";
- this.TFastCancelCharge.Size = new System.Drawing.Size(244, 36);
+ this.TFastCancelCharge.Size = new System.Drawing.Size(160, 34);
this.TFastCancelCharge.Text = "取消记账";
//
// TFastChangeCost
@@ -3378,20 +3376,20 @@
this.TFastChangeCost.Image = global::PEIS.Properties.Resources.刷新;
this.TFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TFastChangeCost.Name = "TFastChangeCost";
- this.TFastChangeCost.Size = new System.Drawing.Size(244, 36);
+ this.TFastChangeCost.Size = new System.Drawing.Size(160, 34);
this.TFastChangeCost.Text = "订单转换";
//
// TFastAllDeleteCost
//
this.TFastAllDeleteCost.Name = "TFastAllDeleteCost";
- this.TFastAllDeleteCost.Size = new System.Drawing.Size(244, 36);
+ this.TFastAllDeleteCost.Size = new System.Drawing.Size(160, 34);
this.TFastAllDeleteCost.Text = "全部删除订单";
this.TFastAllDeleteCost.Visible = false;
//
// TFastAllCancelCharge
//
this.TFastAllCancelCharge.Name = "TFastAllCancelCharge";
- this.TFastAllCancelCharge.Size = new System.Drawing.Size(244, 36);
+ this.TFastAllCancelCharge.Size = new System.Drawing.Size(160, 34);
this.TFastAllCancelCharge.Text = "全部取消记账";
this.TFastAllCancelCharge.Visible = false;
//
@@ -3715,6 +3713,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;
@@ -3726,10 +3740,10 @@
//
this.splitter5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter5.Dock = System.Windows.Forms.DockStyle.Top;
- this.splitter5.Location = new System.Drawing.Point(0, 710);
- this.splitter5.Margin = new System.Windows.Forms.Padding(5);
+ this.splitter5.Location = new System.Drawing.Point(0, 389);
+ this.splitter5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.splitter5.Name = "splitter5";
- this.splitter5.Size = new System.Drawing.Size(1823, 10);
+ this.splitter5.Size = new System.Drawing.Size(911, 5);
this.splitter5.TabIndex = 152;
this.splitter5.TabStop = false;
//
@@ -3740,20 +3754,20 @@
this.panel8.Controls.Add(this.PnlFeeItem);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.panel8.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(1823, 710);
+ this.panel8.Size = new System.Drawing.Size(911, 389);
this.panel8.TabIndex = 151;
//
// DgcEnrollmentFeeItem
//
this.DgcEnrollmentFeeItem.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcEnrollmentFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.DgcEnrollmentFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcEnrollmentFeeItem.Location = new System.Drawing.Point(0, 0);
this.DgcEnrollmentFeeItem.MainView = this.DgvEnrollmentFeeItem;
- this.DgcEnrollmentFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.DgcEnrollmentFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcEnrollmentFeeItem.Name = "DgcEnrollmentFeeItem";
- this.DgcEnrollmentFeeItem.Size = new System.Drawing.Size(1052, 710);
+ this.DgcEnrollmentFeeItem.Size = new System.Drawing.Size(526, 389);
this.DgcEnrollmentFeeItem.TabIndex = 150;
this.DgcEnrollmentFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvEnrollmentFeeItem});
@@ -3971,10 +3985,10 @@
//
this.splitter7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter7.Dock = System.Windows.Forms.DockStyle.Right;
- this.splitter7.Location = new System.Drawing.Point(1052, 0);
- this.splitter7.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.splitter7.Location = new System.Drawing.Point(526, 0);
+ this.splitter7.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.splitter7.Name = "splitter7";
- this.splitter7.Size = new System.Drawing.Size(10, 710);
+ this.splitter7.Size = new System.Drawing.Size(5, 389);
this.splitter7.TabIndex = 149;
this.splitter7.TabStop = false;
this.splitter7.Visible = false;
@@ -3983,10 +3997,10 @@
//
this.PnlFeeItem.Controls.Add(this.tabControl2);
this.PnlFeeItem.Dock = System.Windows.Forms.DockStyle.Right;
- this.PnlFeeItem.Location = new System.Drawing.Point(1062, 0);
- this.PnlFeeItem.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.PnlFeeItem.Location = new System.Drawing.Point(531, 0);
+ this.PnlFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.PnlFeeItem.Name = "PnlFeeItem";
- this.PnlFeeItem.Size = new System.Drawing.Size(761, 710);
+ this.PnlFeeItem.Size = new System.Drawing.Size(380, 389);
this.PnlFeeItem.TabIndex = 147;
this.PnlFeeItem.Visible = false;
//
@@ -3996,20 +4010,20 @@
this.tabControl2.Controls.Add(this.tabPage2);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl2.Location = new System.Drawing.Point(0, 0);
- this.tabControl2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.tabControl2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(761, 710);
+ this.tabControl2.Size = new System.Drawing.Size(380, 389);
this.tabControl2.TabIndex = 139;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.DgcPack2);
- this.tabPage1.Location = new System.Drawing.Point(8, 43);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.tabPage1.Location = new System.Drawing.Point(4, 23);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.tabPage1.Size = new System.Drawing.Size(745, 659);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.tabPage1.Size = new System.Drawing.Size(372, 362);
this.tabPage1.TabIndex = 1;
this.tabPage1.Text = "套餐";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -4017,12 +4031,10 @@
// DgcPack2
//
this.DgcPack2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcPack2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcPack2.Location = new System.Drawing.Point(5, 6);
+ this.DgcPack2.Location = new System.Drawing.Point(2, 3);
this.DgcPack2.MainView = this.DgvPack2;
- this.DgcPack2.Margin = new System.Windows.Forms.Padding(6);
this.DgcPack2.Name = "DgcPack2";
- this.DgcPack2.Size = new System.Drawing.Size(735, 647);
+ this.DgcPack2.Size = new System.Drawing.Size(368, 356);
this.DgcPack2.TabIndex = 122;
this.DgcPack2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPack2,
@@ -4184,11 +4196,11 @@
//
this.tabPage2.Controls.Add(this.DgcFeeItem2);
this.tabPage2.Controls.Add(this.FeeItemSearch2);
- this.tabPage2.Location = new System.Drawing.Point(8, 43);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.tabPage2.Location = new System.Drawing.Point(4, 23);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(5, 6, 5, 6);
- this.tabPage2.Size = new System.Drawing.Size(745, 659);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
+ this.tabPage2.Size = new System.Drawing.Size(372, 362);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "收费项目";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -4196,14 +4208,12 @@
// DgcFeeItem2
//
this.DgcFeeItem2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcFeeItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcFeeItem2.Location = new System.Drawing.Point(5, 42);
+ this.DgcFeeItem2.Location = new System.Drawing.Point(2, 25);
this.DgcFeeItem2.MainView = this.DgvFeeItem2;
- this.DgcFeeItem2.Margin = new System.Windows.Forms.Padding(6);
this.DgcFeeItem2.Name = "DgcFeeItem2";
this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit2});
- this.DgcFeeItem2.Size = new System.Drawing.Size(735, 611);
+ this.DgcFeeItem2.Size = new System.Drawing.Size(368, 334);
this.DgcFeeItem2.TabIndex = 138;
this.DgcFeeItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvFeeItem2,
@@ -4381,10 +4391,10 @@
// FeeItemSearch2
//
this.FeeItemSearch2.Dock = System.Windows.Forms.DockStyle.Top;
- this.FeeItemSearch2.Location = new System.Drawing.Point(5, 6);
- this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.FeeItemSearch2.Location = new System.Drawing.Point(2, 3);
+ this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.FeeItemSearch2.Name = "FeeItemSearch2";
- this.FeeItemSearch2.Size = new System.Drawing.Size(735, 36);
+ this.FeeItemSearch2.Size = new System.Drawing.Size(368, 22);
this.FeeItemSearch2.TabIndex = 137;
//
// panel7
@@ -4392,10 +4402,10 @@
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panel7.Controls.Add(this.menuStrip1);
this.panel7.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel7.Location = new System.Drawing.Point(570, 0);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.panel7.Location = new System.Drawing.Point(285, 0);
+ this.panel7.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(1823, 75);
+ this.panel7.Size = new System.Drawing.Size(911, 42);
this.panel7.TabIndex = 146;
//
// menuStrip1
@@ -4423,8 +4433,8 @@
this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 3, 0, 3);
- this.menuStrip1.Size = new System.Drawing.Size(1382, 46);
+ this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
+ this.menuStrip1.Size = new System.Drawing.Size(893, 44);
this.menuStrip1.TabIndex = 129;
this.menuStrip1.Text = "menuStrip1";
//
@@ -4433,7 +4443,7 @@
this.TsmiCheckOrg.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckOrg.Image")));
this.TsmiCheckOrg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiCheckOrg.Name = "TsmiCheckOrg";
- this.TsmiCheckOrg.Size = new System.Drawing.Size(198, 40);
+ this.TsmiCheckOrg.Size = new System.Drawing.Size(120, 40);
this.TsmiCheckOrg.Text = "生成团体订单";
//
// toolStripMenuItem1
@@ -4446,7 +4456,7 @@
this.TsmiCheckPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckPerson.Image")));
this.TsmiCheckPerson.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiCheckPerson.Name = "TsmiCheckPerson";
- this.TsmiCheckPerson.Size = new System.Drawing.Size(200, 40);
+ this.TsmiCheckPerson.Size = new System.Drawing.Size(122, 40);
this.TsmiCheckPerson.Text = "生成个人订单";
//
// toolStripMenuItem7
@@ -4463,28 +4473,28 @@
this.TsmiPrintCost.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintCost.Image")));
this.TsmiPrintCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiPrintCost.Name = "TsmiPrintCost";
- this.TsmiPrintCost.Size = new System.Drawing.Size(182, 40);
+ this.TsmiPrintCost.Size = new System.Drawing.Size(116, 40);
this.TsmiPrintCost.Text = "打印收费单";
//
// TsmiPrintPerson
//
this.TsmiPrintPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintPerson.Image")));
this.TsmiPrintPerson.Name = "TsmiPrintPerson";
- this.TsmiPrintPerson.Size = new System.Drawing.Size(328, 38);
+ this.TsmiPrintPerson.Size = new System.Drawing.Size(188, 26);
this.TsmiPrintPerson.Text = "打印个人收费单";
//
// TsmiPrintTeam
//
this.TsmiPrintTeam.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintTeam.Image")));
this.TsmiPrintTeam.Name = "TsmiPrintTeam";
- this.TsmiPrintTeam.Size = new System.Drawing.Size(328, 38);
+ this.TsmiPrintTeam.Size = new System.Drawing.Size(188, 26);
this.TsmiPrintTeam.Text = "打印团体收费单";
//
// TsmiPrintGroup
//
this.TsmiPrintGroup.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGroup.Image")));
this.TsmiPrintGroup.Name = "TsmiPrintGroup";
- this.TsmiPrintGroup.Size = new System.Drawing.Size(328, 38);
+ this.TsmiPrintGroup.Size = new System.Drawing.Size(188, 26);
this.TsmiPrintGroup.Text = "打印团体分组收费单";
//
// toolStripMenuItem3
@@ -4498,7 +4508,7 @@
this.TsmiFee.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFee.Image")));
this.TsmiFee.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiFee.Name = "TsmiFee";
- this.TsmiFee.Size = new System.Drawing.Size(110, 40);
+ this.TsmiFee.Size = new System.Drawing.Size(80, 40);
this.TsmiFee.Text = "记账";
this.TsmiFee.Visible = false;
//
@@ -4512,7 +4522,7 @@
this.TsmiSend.Image = ((System.Drawing.Image)(resources.GetObject("TsmiSend.Image")));
this.TsmiSend.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiSend.Name = "TsmiSend";
- this.TsmiSend.Size = new System.Drawing.Size(178, 40);
+ this.TsmiSend.Size = new System.Drawing.Size(112, 40);
this.TsmiSend.Text = "发送到科室";
//
// toolStripMenuItem4
@@ -4525,7 +4535,7 @@
this.TsmiPrintGuide.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGuide.Image")));
this.TsmiPrintGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiPrintGuide.Name = "TsmiPrintGuide";
- this.TsmiPrintGuide.Size = new System.Drawing.Size(182, 40);
+ this.TsmiPrintGuide.Size = new System.Drawing.Size(116, 40);
this.TsmiPrintGuide.Text = "打印导检单";
//
// toolStripMenuItem5
@@ -4538,7 +4548,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 = "打开收费项目";
//
// toolStripMenuItem6
@@ -4551,17 +4561,17 @@
this.TsmiBatchCtrl.Image = ((System.Drawing.Image)(resources.GetObject("TsmiBatchCtrl.Image")));
this.TsmiBatchCtrl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.TsmiBatchCtrl.Name = "TsmiBatchCtrl";
- this.TsmiBatchCtrl.Size = new System.Drawing.Size(158, 40);
+ this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40);
this.TsmiBatchCtrl.Text = "批量操作";
//
// splitterControl1
//
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(560, 0);
- this.splitterControl1.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.splitterControl1.Location = new System.Drawing.Point(280, 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, 1702);
+ this.splitterControl1.Size = new System.Drawing.Size(5, 736);
this.splitterControl1.TabIndex = 145;
this.splitterControl1.TabStop = false;
//
@@ -4571,23 +4581,21 @@
this.panel11.Controls.Add(this.PatientSearch);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.panel11.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(560, 1702);
+ this.panel11.Size = new System.Drawing.Size(280, 736);
this.panel11.TabIndex = 144;
//
// DgcEnrollment
//
this.DgcEnrollment.ContextMenuStrip = this.InfoFastMenu;
this.DgcEnrollment.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcEnrollment.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6);
- this.DgcEnrollment.Location = new System.Drawing.Point(0, 39);
+ this.DgcEnrollment.Location = new System.Drawing.Point(0, 23);
this.DgcEnrollment.MainView = this.DgvEnrollment;
- this.DgcEnrollment.Margin = new System.Windows.Forms.Padding(6);
this.DgcEnrollment.Name = "DgcEnrollment";
this.DgcEnrollment.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit3});
- this.DgcEnrollment.Size = new System.Drawing.Size(560, 1663);
+ this.DgcEnrollment.Size = new System.Drawing.Size(280, 713);
this.DgcEnrollment.TabIndex = 133;
this.DgcEnrollment.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvEnrollment});
@@ -4599,18 +4607,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(205, 214);
//
// 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(204, 30);
this.FastCamera.Text = "拍照";
//
// FastDelete
@@ -4618,34 +4627,43 @@
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(204, 30);
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(204, 30);
+ this.FastExport.Text = "导出所有成员";
+ //
+ // FastExportTime
+ //
+ this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel;
+ this.FastExportTime.Name = "FastExportTime";
+ this.FastExportTime.Size = new System.Drawing.Size(204, 30);
+ 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(204, 30);
this.FastRecall.Text = "撤回发送";
//
// FastGroup
//
this.FastGroup.Name = "FastGroup";
- this.FastGroup.Size = new System.Drawing.Size(240, 36);
+ this.FastGroup.Size = new System.Drawing.Size(204, 30);
this.FastGroup.Text = "组合缴费";
+ this.FastGroup.Visible = false;
//
// FastCancelGroup
//
this.FastCancelGroup.Name = "FastCancelGroup";
- this.FastCancelGroup.Size = new System.Drawing.Size(240, 36);
+ this.FastCancelGroup.Size = new System.Drawing.Size(204, 30);
this.FastCancelGroup.Text = "取消组合缴费";
+ this.FastCancelGroup.Visible = false;
//
// DgvEnrollment
//
@@ -4655,6 +4673,8 @@
this.DgvEnrollment.Appearance.FooterPanel.Options.UseForeColor = true;
this.DgvEnrollment.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.DgvEnrollment.Appearance.GroupRow.Options.UseFont = true;
+ this.DgvEnrollment.Appearance.HeaderPanel.Font = new System.Drawing.Font("微软雅黑", 12F);
+ this.DgvEnrollment.Appearance.HeaderPanel.Options.UseFont = true;
this.DgvEnrollment.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F);
this.DgvEnrollment.Appearance.Row.Options.UseFont = true;
this.DgvEnrollment.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -4663,13 +4683,14 @@
this.gridColumn103,
this.gridColumn89,
this.gridColumn90,
- this.gridColumn107,
this.gridColumn108,
this.gridColumn91,
this.gridColumn93,
this.gridColumn94,
this.gridColumn95,
this.gridColumn96,
+ this.gridColumn105,
+ this.gridColumn104,
this.gridColumn92});
this.DgvEnrollment.GridControl = this.DgcEnrollment;
this.DgvEnrollment.GroupCount = 1;
@@ -4738,6 +4759,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 +4779,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 +4799,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 +4808,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 +4837,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 +4855,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 +4876,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 +4899,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 +4920,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 = 12;
+ //
// gridColumn92
//
this.gridColumn92.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -4912,8 +4955,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
//
@@ -4921,9 +4971,9 @@
this.PatientSearch.Dock = System.Windows.Forms.DockStyle.Top;
this.PatientSearch.Font = new System.Drawing.Font("微软雅黑", 9F);
this.PatientSearch.Location = new System.Drawing.Point(0, 0);
- this.PatientSearch.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+ this.PatientSearch.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.PatientSearch.Name = "PatientSearch";
- this.PatientSearch.Size = new System.Drawing.Size(560, 39);
+ this.PatientSearch.Size = new System.Drawing.Size(280, 23);
this.PatientSearch.TabIndex = 134;
//
// gridColumn109
@@ -5134,66 +5184,33 @@
//
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;
+ // 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(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(2884, 1759);
+ this.ClientSize = new System.Drawing.Size(1442, 779);
this.Controls.Add(this.TcOrg);
this.Controls.Add(this.splitter1);
this.Controls.Add(this.panel1);
- this.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8);
+ this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.Name = "EnrollmentOrgForm";
this.Text = "团体登记";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).EndInit();
@@ -5388,7 +5405,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 +5664,8 @@
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;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn105;
}
}
\ 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/EnrollmentOrgForm.resx b/PEIS/View/Enrollment/EnrollmentOrgForm.resx
index 098ea78..debec70 100644
--- a/PEIS/View/Enrollment/EnrollmentOrgForm.resx
+++ b/PEIS/View/Enrollment/EnrollmentOrgForm.resx
@@ -454,7 +454,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
@@ -465,7 +465,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
@@ -481,7 +481,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
@@ -497,7 +497,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
@@ -512,7 +512,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl
YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6
E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt
@@ -525,7 +525,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb
QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk
EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C
@@ -538,7 +538,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++
79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S
+1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO
@@ -552,7 +552,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA
Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR
KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB
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);
}