From 36455d060a87fe49802a69b23e77811152b935c4 Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 31 Oct 2024 17:13:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=93=E8=AE=BA=E8=AF=8D=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE=EF=BC=8C2?= =?UTF-8?q?=E3=80=81=E5=8F=91=E9=80=81=E5=88=B0=E7=A7=91=E5=AE=A4=E6=97=B6?= =?UTF-8?q?=E8=B0=83=E7=94=A8HIS=E8=AE=B0=E8=B4=A6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 2 +- PEIS/View/Exam/TotalForm.cs | 13 ++++++++++--- PEIS/View/UControl/OpMenuSimple.Designer.cs | 13 +++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index cd7700f..207be21 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -602,7 +602,7 @@ namespace PEIS.View.Enrollment if (Global.Msg("warn", "确定要发送吗？") == DialogResult.No) return; - //CostToHis(_chooseRegItem.ID); + CostToHis(_chooseRegItem.ID); OnSendToDept(_chooseRegItem.ID); OnGetRegItems(0); OnGetCheckCost(_chooseRegItem.ID); diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs index 10557c6..a55bd18 100644 --- a/PEIS/View/Exam/TotalForm.cs +++ b/PEIS/View/Exam/TotalForm.cs @@ -1,6 +1,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Base; using DevExpress.XtraGrid.Views.Grid; +using LIS.Model; using PEIS.Base; using PEIS.Entity; using PEIS.Event; @@ -88,13 +89,19 @@ namespace PEIS.View.Exam RbStatus2.Click += RadioButton_Click; // 输入体检号回车 //txtId.KeyDown += TxtId_KeyDown; - OpsConclusion.TsmiRefresh.Text = "上移"; - OpsConclusion.TsmiRefresh.Image = Properties.Resources.shang; OpsConclusion.TsmiAdd.Text = "下移"; OpsConclusion.TsmiAdd.Image = Properties.Resources.xia; OpsConclusion.TsmiAllDelete.Visible = true; - //结论-排序 + OpsConclusion.TsmiUp.Visible = true; + // 重新加载结论 OpsConclusion.TsmiRefresh.Click += (s, e) => + { + CacheDataModel.GetConclusions(); + CmbSearchConclusion.DataSource = Global._lstConclusion; + SearchAllConclusion(); + }; + //结论-排序 + OpsConclusion.TsmiUp.Click += (s, e) => { ConclusionSort(-1); }; diff --git a/PEIS/View/UControl/OpMenuSimple.Designer.cs b/PEIS/View/UControl/OpMenuSimple.Designer.cs index 13caab1..47d3853 100644 --- a/PEIS/View/UControl/OpMenuSimple.Designer.cs +++ b/PEIS/View/UControl/OpMenuSimple.Designer.cs @@ -35,6 +35,7 @@ this.TsmiDelete = new System.Windows.Forms.ToolStripMenuItem(); this.TsmiAdd = new System.Windows.Forms.ToolStripMenuItem(); this.TsmiRefresh = new System.Windows.Forms.ToolStripMenuItem(); + this.TsmiUp = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -50,6 +51,7 @@ this.TsmiAllDelete, this.TsmiDelete, this.TsmiAdd, + this.TsmiUp, this.TsmiRefresh}); this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); @@ -107,6 +109,16 @@ this.TsmiRefresh.Size = new System.Drawing.Size(75, 34); this.TsmiRefresh.Text = "刷新"; // + // TsmiUp + // + this.TsmiUp.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.TsmiUp.Image = global::PEIS.Properties.Resources.shang; + this.TsmiUp.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.TsmiUp.Name = "TsmiUp"; + this.TsmiUp.Size = new System.Drawing.Size(69, 34); + this.TsmiUp.Text = "上移"; + this.TsmiUp.Visible = false; + // // OpMenuSimple // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -129,5 +141,6 @@ public System.Windows.Forms.ToolStripMenuItem TsmiAdd; public System.Windows.Forms.ToolStripMenuItem TsmiRefresh; public System.Windows.Forms.ToolStripMenuItem TsmiAllDelete; + public System.Windows.Forms.ToolStripMenuItem TsmiUp; } }