diff --git a/PEIS/ReportFiles/Guide.frx b/PEIS/ReportFiles/Guide.frx index 7062285..c82d1d8 100644 --- a/PEIS/ReportFiles/Guide.frx +++ b/PEIS/ReportFiles/Guide.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -74,6 +74,7 @@ namespace FastReport + @@ -148,7 +149,8 @@ namespace FastReport - + + diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index e2d32db..7806c0c 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -503,6 +503,9 @@ namespace PEIS.Utils rpt.SetParameterValue("Nation", regInfo.Nation); rpt.SetParameterValue("CardNo", regInfo.CardNo); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); + rpt.SetParameterValue("Url", + Global.GetWeChatPayUrl() + + Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(regInfo.CardNo))); if (string.IsNullOrEmpty(regInfo.Photo)) { @@ -636,6 +639,9 @@ namespace PEIS.Utils rpt.SetParameterValue("Nation", patient.Nation); rpt.SetParameterValue("CardNo", patient.CardNo); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); + rpt.SetParameterValue("Url", + Global.GetWeChatPayUrl() + + Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(patient.CardNo))); if (patient.Photo == null) { diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 49394da..6b8a413 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -525,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, 5, 6, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(472, 1421); + 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, 7, 8, 7); - this.DgcOrg.Location = new System.Drawing.Point(0, 297); + 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, 5, 6, 5); this.DgcOrg.Name = "DgcOrg"; - this.DgcOrg.Size = new System.Drawing.Size(472, 1124); + 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}); @@ -733,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, 5, 6, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(472, 297); + this.panel2.Size = new System.Drawing.Size(236, 163); this.panel2.TabIndex = 0; // // groupBox2 @@ -750,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, 4, 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(4, 5, 4, 5); - this.groupBox2.Size = new System.Drawing.Size(472, 297); + 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 = "快速查询"; @@ -762,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, 44); - this.NameSearch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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, 46); - this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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 = "模糊检索"; // @@ -790,10 +787,10 @@ this.toolStripMenuItem10, this.TsmiOrgAdd}); this.menuStrip2.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; - this.menuStrip2.Location = new System.Drawing.Point(4, 249); + this.menuStrip2.Location = new System.Drawing.Point(2, 126); this.menuStrip2.Name = "menuStrip2"; - this.menuStrip2.Padding = new System.Windows.Forms.Padding(4, 4, 0, 4); - this.menuStrip2.Size = new System.Drawing.Size(464, 43); + 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"; // @@ -803,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 @@ -818,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(4, 0, 4, 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 = "终止日期"; // @@ -837,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, 181); - this.DtpEndDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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); // @@ -850,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, 111); - this.DtpBegDate.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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, 120); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 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(472, 0); - this.splitter1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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, 1421); + 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(480, 0); - this.TcOrg.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + 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(2404, 1421); + this.TcOrg.Size = new System.Drawing.Size(1202, 779); this.TcOrg.TabIndex = 35; this.TcOrg.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.TpGroup, @@ -900,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, 5, 6, 5); this.TpGroup.Name = "TpGroup"; - this.TpGroup.Size = new System.Drawing.Size(2392, 1364); + 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, 345); - this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + 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, 1019); + this.xtraTabControl1.Size = new System.Drawing.Size(658, 547); this.xtraTabControl1.TabIndex = 131; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage1}); @@ -920,23 +914,20 @@ // xtraTabPage1 // this.xtraTabPage1.Controls.Add(this.DgcGroupPatient); - this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1304, 962); + 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, 5, 6, 5); this.DgcGroupPatient.Location = new System.Drawing.Point(0, 0); this.DgcGroupPatient.MainView = this.DgvGroupPatient; - this.DgcGroupPatient.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcGroupPatient.Name = "DgcGroupPatient"; this.DgcGroupPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemImageEdit2}); - this.DgcGroupPatient.Size = new System.Drawing.Size(1304, 962); + 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}); @@ -947,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 @@ -1267,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, 345); - this.splitter3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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, 1019); + 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, 345); - this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + 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(1068, 1019); + this.xtraTabControl2.Size = new System.Drawing.Size(534, 547); this.xtraTabControl2.TabIndex = 134; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage3}); @@ -1290,22 +1280,19 @@ // this.xtraTabPage3.Controls.Add(this.DgcPatient); this.xtraTabPage3.Controls.Add(this.panel10); - this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.xtraTabPage3.Name = "xtraTabPage3"; - this.xtraTabPage3.Size = new System.Drawing.Size(1056, 962); + 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, 5, 6, 5); - this.DgcPatient.Location = new System.Drawing.Point(0, 67); + this.DgcPatient.Location = new System.Drawing.Point(0, 37); this.DgcPatient.MainView = this.DgvPatient; - this.DgcPatient.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcPatient.Name = "DgcPatient"; this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemImageEdit1}); - this.DgcPatient.Size = new System.Drawing.Size(1056, 895); + 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}); @@ -1623,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, 5, 6, 5); this.panel10.Name = "panel10"; - this.panel10.Size = new System.Drawing.Size(1056, 67); + 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, 4); - this.ImportBtn.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.ImportBtn.Location = new System.Drawing.Point(406, 2); this.ImportBtn.Name = "ImportBtn"; - this.ImportBtn.Size = new System.Drawing.Size(286, 71); + this.ImportBtn.Size = new System.Drawing.Size(143, 39); this.ImportBtn.TabIndex = 5; this.ImportBtn.Text = "全部导入"; this.ImportBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1646,10 +1631,9 @@ // this.NewBaseBtn.AutoSize = true; this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加; - this.NewBaseBtn.Location = new System.Drawing.Point(568, 4); - this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.NewBaseBtn.Location = new System.Drawing.Point(284, 2); this.NewBaseBtn.Name = "NewBaseBtn"; - this.NewBaseBtn.Size = new System.Drawing.Size(290, 71); + this.NewBaseBtn.Size = new System.Drawing.Size(145, 39); this.NewBaseBtn.TabIndex = 4; this.NewBaseBtn.Text = "新增成员"; this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1658,10 +1642,9 @@ // RbFit // this.RbFit.AutoSize = true; - this.RbFit.Location = new System.Drawing.Point(264, 15); - this.RbFit.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + 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 = "符合条件未分组成员"; @@ -1671,10 +1654,9 @@ // this.RbAll.AutoSize = true; this.RbAll.Checked = true; - this.RbAll.Location = new System.Drawing.Point(14, 15); - this.RbAll.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + 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 = "所有未分组成员"; @@ -1684,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, 336); - this.splitter2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 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(2392, 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, 5, 6, 5); - this.DgcGroup.Location = new System.Drawing.Point(0, 77); + this.DgcGroup.Location = new System.Drawing.Point(0, 42); this.DgcGroup.MainView = this.DgvGroup; - this.DgcGroup.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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(2392, 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}); @@ -1909,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, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(2392, 77); + 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(2392, 77); + this.OpsGroup.Size = new System.Drawing.Size(1196, 42); this.OpsGroup.TabIndex = 2; // // TpGroupFeeItem @@ -1929,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, 5, 6, 5); this.TpGroupFeeItem.Name = "TpGroupFeeItem"; - this.TpGroupFeeItem.Size = new System.Drawing.Size(2392, 1364); + this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 736); this.TpGroupFeeItem.Text = "分组项目"; // // panel5 @@ -1941,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, 350); - this.panel5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(2392, 1014); + this.panel5.Size = new System.Drawing.Size(1196, 544); this.panel5.TabIndex = 139; // // DgcGroupFeeItem // this.DgcGroupFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcGroupFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - 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, 5, 6, 5); this.DgcGroupFeeItem.Name = "DgcGroupFeeItem"; this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit1}); - this.DgcGroupFeeItem.Size = new System.Drawing.Size(1464, 1005); + this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 539); this.DgcGroupFeeItem.TabIndex = 137; this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvGroupFeeItem}); @@ -2155,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(1464, 9); - this.splitter4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.splitter4.Location = new System.Drawing.Point(732, 5); this.splitter4.Name = "splitter4"; - this.splitter4.Size = new System.Drawing.Size(8, 1005); + this.splitter4.Size = new System.Drawing.Size(4, 539); this.splitter4.TabIndex = 142; this.splitter4.TabStop = false; // @@ -2166,10 +2141,10 @@ // this.panel9.Controls.Add(this.tabControl1); this.panel9.Dock = System.Windows.Forms.DockStyle.Right; - this.panel9.Location = new System.Drawing.Point(1472, 9); - this.panel9.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(920, 1005); + this.panel9.Size = new System.Drawing.Size(460, 539); this.panel9.TabIndex = 141; // // tabControl1 @@ -2178,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(4, 5, 4, 5); + 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(920, 1005); + this.tabControl1.Size = new System.Drawing.Size(460, 539); this.tabControl1.TabIndex = 139; // // TpPack // this.TpPack.Controls.Add(this.DgcPack); - this.TpPack.Location = new System.Drawing.Point(8, 43); - this.TpPack.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(4, 5, 4, 5); - this.TpPack.Size = new System.Drawing.Size(904, 954); + this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.TpPack.Size = new System.Drawing.Size(452, 523); this.TpPack.TabIndex = 1; this.TpPack.Text = "套餐"; this.TpPack.UseVisualStyleBackColor = true; @@ -2199,12 +2174,10 @@ // DgcPack // this.DgcPack.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPack.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcPack.Location = new System.Drawing.Point(4, 5); + this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; - this.DgcPack.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcPack.Name = "DgcPack"; - this.DgcPack.Size = new System.Drawing.Size(896, 944); + this.DgcPack.Size = new System.Drawing.Size(448, 517); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2365,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(4, 5, 4, 5); + 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(4, 5, 4, 5); - this.TpFeeItem.Size = new System.Drawing.Size(904, 954); + this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.TpFeeItem.Size = new System.Drawing.Size(452, 523); this.TpFeeItem.TabIndex = 0; this.TpFeeItem.Text = "收费项目"; this.TpFeeItem.UseVisualStyleBackColor = true; @@ -2377,14 +2350,12 @@ // DgcFeeItem // this.DgcFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcFeeItem.Location = new System.Drawing.Point(4, 41); + this.DgcFeeItem.Location = new System.Drawing.Point(2, 25); this.DgcFeeItem.MainView = this.DgvFeeItem; - this.DgcFeeItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(896, 908); + this.DgcFeeItem.Size = new System.Drawing.Size(448, 495); this.DgcFeeItem.TabIndex = 137; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -2558,10 +2529,10 @@ // FeeItemSearch // this.FeeItemSearch.Dock = System.Windows.Forms.DockStyle.Top; - this.FeeItemSearch.Location = new System.Drawing.Point(4, 5); - this.FeeItemSearch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(896, 36); + this.FeeItemSearch.Size = new System.Drawing.Size(448, 22); this.FeeItemSearch.TabIndex = 136; // // splitter8 @@ -2569,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, 5, 6, 5); this.splitter8.Name = "splitter8"; - this.splitter8.Size = new System.Drawing.Size(2392, 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, 5, 6, 5); - this.DgcGroup2.Location = new System.Drawing.Point(0, 80); + this.DgcGroup2.Location = new System.Drawing.Point(0, 44); this.DgcGroup2.MainView = this.DgvGroup2; - this.DgcGroup2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); 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(2392, 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}); @@ -2814,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(4, 5, 4, 5); + this.panel4.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(2392, 80); + this.panel4.Size = new System.Drawing.Size(1196, 44); this.panel4.TabIndex = 141; // // BtnApplyGroupFeeItem @@ -2828,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(2026, 0); - this.BtnApplyGroupFeeItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.BtnApplyGroupFeeItem.Location = new System.Drawing.Point(1013, 0); this.BtnApplyGroupFeeItem.Name = "BtnApplyGroupFeeItem"; - this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(366, 80); + this.BtnApplyGroupFeeItem.Size = new System.Drawing.Size(183, 44); this.BtnApplyGroupFeeItem.TabIndex = 34; this.BtnApplyGroupFeeItem.Text = "应用收费模板到团体成员"; this.BtnApplyGroupFeeItem.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -2844,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, 5, 6, 5); this.TpPerson.Name = "TpPerson"; - this.TpPerson.Size = new System.Drawing.Size(2392, 1364); + this.TpPerson.Size = new System.Drawing.Size(1196, 736); this.TpPerson.Text = "团体成员收费"; // // panel6 @@ -2857,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, 5, 6, 5); + this.panel6.Location = new System.Drawing.Point(285, 42); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(1822, 1289); + 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(1110, 718); - this.panel13.Margin = new System.Windows.Forms.Padding(4, 5, 4, 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, 571); + 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(4, 5, 4, 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, 571); + this.xtraTabControl4.Size = new System.Drawing.Size(356, 300); this.xtraTabControl4.TabIndex = 1; this.xtraTabControl4.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage4}); @@ -2888,23 +2853,21 @@ // xtraTabPage4 // this.xtraTabPage4.Controls.Add(this.DgcCheckCost2); - this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 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, 514); + 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, 5, 6, 5); this.DgcCheckCost2.Location = new System.Drawing.Point(0, 0); this.DgcCheckCost2.MainView = this.DgvCheckCost2; - this.DgcCheckCost2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcCheckCost2.Name = "DgcCheckCost2"; this.DgcCheckCost2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit2}); - this.DgcCheckCost2.Size = new System.Drawing.Size(700, 514); + 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}); @@ -2922,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 @@ -2943,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 @@ -2951,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 @@ -2959,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; // @@ -2981,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; // @@ -3313,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(1100, 718); - this.splitter6.Margin = new System.Windows.Forms.Padding(4, 5, 4, 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, 571); + this.splitter6.Size = new System.Drawing.Size(5, 300); this.splitter6.TabIndex = 154; this.splitter6.TabStop = false; // @@ -3324,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, 718); - this.panel12.Margin = new System.Windows.Forms.Padding(4, 5, 4, 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(1100, 571); + 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(4, 5, 4, 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(1100, 571); + this.xtraTabControl3.Size = new System.Drawing.Size(550, 300); this.xtraTabControl3.TabIndex = 0; this.xtraTabControl3.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.xtraTabPage2}); @@ -3345,23 +3308,21 @@ // xtraTabPage2 // this.xtraTabPage2.Controls.Add(this.DgcCheckCost); - this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1088, 514); + 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, 5, 6, 5); this.DgcCheckCost.Location = new System.Drawing.Point(0, 0); this.DgcCheckCost.MainView = this.DgvCheckCost; - this.DgcCheckCost.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcCheckCost.Name = "DgcCheckCost"; this.DgcCheckCost.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcCheckCost.Size = new System.Drawing.Size(1088, 514); + 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}); @@ -3378,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 @@ -3399,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 @@ -3407,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 @@ -3415,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; // @@ -3779,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, 709); - this.splitter5.Margin = new System.Windows.Forms.Padding(4, 5, 4, 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(1822, 9); + this.splitter5.Size = new System.Drawing.Size(911, 5); this.splitter5.TabIndex = 152; this.splitter5.TabStop = false; // @@ -3793,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(4, 5, 4, 5); + this.panel8.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel8.Name = "panel8"; - this.panel8.Size = new System.Drawing.Size(1822, 709); + 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(4, 5, 4, 5); + 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(4, 5, 4, 5); + this.DgcEnrollmentFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.DgcEnrollmentFeeItem.Name = "DgcEnrollmentFeeItem"; - this.DgcEnrollmentFeeItem.Size = new System.Drawing.Size(1052, 709); + 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}); @@ -4024,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(4, 5, 4, 5); + 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, 709); + this.splitter7.Size = new System.Drawing.Size(5, 389); this.splitter7.TabIndex = 149; this.splitter7.TabStop = false; this.splitter7.Visible = false; @@ -4036,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(4, 5, 4, 5); + 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(760, 709); + this.PnlFeeItem.Size = new System.Drawing.Size(380, 389); this.PnlFeeItem.TabIndex = 147; this.PnlFeeItem.Visible = false; // @@ -4049,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(4, 5, 4, 5); + 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(760, 709); + 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(4, 5, 4, 5); + 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(4, 5, 4, 5); - this.tabPage1.Size = new System.Drawing.Size(744, 658); + 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; @@ -4070,12 +4031,10 @@ // DgcPack2 // this.DgcPack2.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPack2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcPack2.Location = new System.Drawing.Point(4, 5); + this.DgcPack2.Location = new System.Drawing.Point(2, 3); this.DgcPack2.MainView = this.DgvPack2; - this.DgcPack2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcPack2.Name = "DgcPack2"; - this.DgcPack2.Size = new System.Drawing.Size(736, 648); + 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, @@ -4237,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(4, 5, 4, 5); + 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(4, 5, 4, 5); - this.tabPage2.Size = new System.Drawing.Size(744, 658); + 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; @@ -4249,14 +4208,12 @@ // DgcFeeItem2 // this.DgcFeeItem2.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcFeeItem2.Location = new System.Drawing.Point(4, 41); + this.DgcFeeItem2.Location = new System.Drawing.Point(2, 25); this.DgcFeeItem2.MainView = this.DgvFeeItem2; - this.DgcFeeItem2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcFeeItem2.Name = "DgcFeeItem2"; this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcFeeItem2.Size = new System.Drawing.Size(736, 612); + 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, @@ -4434,10 +4391,10 @@ // FeeItemSearch2 // this.FeeItemSearch2.Dock = System.Windows.Forms.DockStyle.Top; - this.FeeItemSearch2.Location = new System.Drawing.Point(4, 5); - this.FeeItemSearch2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + 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(736, 36); + this.FeeItemSearch2.Size = new System.Drawing.Size(368, 22); this.FeeItemSearch2.TabIndex = 137; // // panel7 @@ -4445,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(4, 5, 4, 5); + 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(1822, 75); + this.panel7.Size = new System.Drawing.Size(911, 42); this.panel7.TabIndex = 146; // // menuStrip1 @@ -4476,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(4, 4, 0, 4); - this.menuStrip1.Size = new System.Drawing.Size(1381, 48); + this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1105, 44); this.menuStrip1.TabIndex = 129; this.menuStrip1.Text = "menuStrip1"; // @@ -4486,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 @@ -4499,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 @@ -4516,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 @@ -4551,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; // @@ -4565,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 @@ -4578,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 @@ -4591,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 @@ -4604,17 +4561,18 @@ 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 = "批量操作"; + this.TsmiBatchCtrl.Visible = false; // // 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(4, 5, 4, 5); + 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, 1364); + this.splitterControl1.Size = new System.Drawing.Size(5, 736); this.splitterControl1.TabIndex = 145; this.splitterControl1.TabStop = false; // @@ -4624,23 +4582,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(4, 5, 4, 5); + this.panel11.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.panel11.Name = "panel11"; - this.panel11.Size = new System.Drawing.Size(560, 1364); + 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, 5, 6, 5); - 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, 5, 6, 5); this.DgcEnrollment.Name = "DgcEnrollment"; this.DgcEnrollment.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit3}); - this.DgcEnrollment.Size = new System.Drawing.Size(560, 1325); + 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}); @@ -4657,14 +4613,14 @@ this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(337, 256); + 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(336, 36); + this.FastCamera.Size = new System.Drawing.Size(204, 30); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4672,40 +4628,40 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(336, 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(336, 36); + 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(336, 36); + 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(336, 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(336, 36); + this.FastGroup.Size = new System.Drawing.Size(204, 30); this.FastGroup.Text = "组合缴费"; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(336, 36); + this.FastCancelGroup.Size = new System.Drawing.Size(204, 30); this.FastCancelGroup.Text = "取消组合缴费"; // // DgvEnrollment @@ -5031,9 +4987,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(4, 5, 4, 5); + 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 @@ -5246,14 +5202,14 @@ // // 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, 1421); + 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, 7, 6, 7); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "EnrollmentOrgForm"; this.Text = "团体登记"; ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).EndInit(); 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