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

+总检结论词手动排序、删除结论词优化

Browse Source
dhzzyy
HI 11 months ago committed by lsm
parent 8807faa7ee
commit a854063b05
7 changed files with 359 additions and 317 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      PEIS/Properties/Resources.Designer.cs
  2. 30
      PEIS/Properties/Resources.resx
  3. BIN
      PEIS/Resources/shang.png
  4. BIN
      PEIS/Resources/xia.png
  5. 481
      PEIS/View/Exam/TotalForm.Designer.cs
  6. 81
      PEIS/View/Exam/TotalForm.cs
  7. 26
      PEIS/View/Exam/TotalForm.resx

20
PEIS/Properties/Resources.Designer.cs generated
Unescape View File

@ -140,6 +140,16 @@ namespace PEIS.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap shang {
get {
object obj = ResourceManager.GetObject("shang", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
@ -170,6 +180,16 @@ namespace PEIS.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap xia {
get {
object obj = ResourceManager.GetObject("xia", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>

30
PEIS/Properties/Resources.resx
Unescape View File

@ -130,6 +130,9 @@
<data name="审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -157,9 +160,6 @@
<data name="Report" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="预览报告" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="查找" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -172,6 +172,9 @@
<data name="刷新" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\刷新.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="个人信息 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -184,6 +187,9 @@
<data name="结论" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wechatlogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="添加" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\添加1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -199,25 +205,25 @@
<data name="WeChat" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\WeChat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="取消审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="取消" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\取消.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="分检页面" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\分检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="left" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="取消审核" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="总检页面" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\总检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="个人信息 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="预览报告" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wechatlogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="shang" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="xia" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
PEIS/Resources/shang.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
PEIS/Resources/xia.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

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

File diff suppressed because it is too large Load Diff

81
PEIS/View/Exam/TotalForm.cs
Unescape View File

@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Base;
@ -87,10 +90,19 @@ namespace PEIS.View.Exam
RbStatus2.Click += RadioButton_Click;
// 输入体检号回车
//txtId.KeyDown += TxtId_KeyDown;
OpsConclusion.TsmiRefresh.Visible = false;
OpsConclusion.TsmiAdd.Visible = false;
//结论-添加
//OpsConclusion.TsmiAdd.Click += ConclusionAdd_Click;
OpsConclusion.TsmiRefresh.Text = "上移";
OpsConclusion.TsmiRefresh.Image = Properties.Resources.shang;
OpsConclusion.TsmiAdd.Text = "下移";
OpsConclusion.TsmiAdd.Image = Properties.Resources.xia;
//结论-排序
OpsConclusion.TsmiRefresh.Click += (s, e) =>
{
ConclusionSort(-1);
};
OpsConclusion.TsmiAdd.Click += (s, e) =>
{
ConclusionSort(1);
};
//结论-删除
OpsConclusion.TsmiDelete.Click += ConclusionDelete_Click;
//结论-保存
@ -219,8 +231,45 @@ namespace PEIS.View.Exam
// DgvAllConclusion.OptionsFind.ShowCloseButton = false;
DgvAllConclusion.DoubleClick += DgvAllConclusion_DoubleClick;
DgvExamResultData.CustomDrawCell += DgvExamResultData_CustomDrawCell;
// 启用行选择
DgvExamConclusion.OptionsSelection.EnableAppearanceFocusedCell = false;
DgvExamConclusion.OptionsSelection.MultiSelect = false; // 限制单选
// 启用编辑功能，以便显示勾选框
DgvExamConclusion.OptionsBehavior.Editable = true;
// 设置行头自动调整高度以显示勾选框
DgvExamConclusion.OptionsView.RowAutoHeight = true;
}
private void ConclusionSort(int i)
{
if (DgvExamConclusion.GetFocusedRow() is ExamConclusion selected)
{
var current = _examConclusion.IndexOf(selected);
if ((current == 0 && i < 0) || (current == _examConclusion.Count - 1 && i > 0))
{
return;
}
var temp = _examConclusion[current + i];
var tempSeq = _examConclusion[current + i].Seq;
temp.Seq = selected.Seq;
selected.Seq = tempSeq;
_examConclusion[current + i] = selected;
_examConclusion[current] = temp;
_examConclusion = _examConclusion.OrderBy(o => o.Seq).ToList();
// for (int j = 0; j < _examConclusion.Count; j++)
// {
// _examConclusion[j].Seq = j + 1;
// }
Invoke(new Action(() => DgcExamConclusion.DataSource = null));
Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current+i));
Invoke(new Action(() => DgvExamConclusion.SelectRow(current + i)));
}
}
private void SearchAllConclusion()
{
var query = txtConclusionSerch.Text;
@ -504,6 +553,11 @@ namespace PEIS.View.Exam
public void ShowExamConclusion(List<ExamConclusion> items)
{
items = items.OrderBy(o => o.Seq).ToList();
for (int j = 0; j < items.Count; j++)
{
items[j].Seq = j + 1;
}
Invoke(new Action(() => DgcExamConclusion.DataSource = null));
Invoke(new Action(() => _examConclusion = items));
Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
@ -731,8 +785,27 @@ namespace PEIS.View.Exam
if (DgvExamConclusion.GetSelectedRows().Length == 0) return;
var item = DgvExamConclusion.GetRow(DgvExamConclusion.FocusedRowHandle) as ExamConclusion;
if (item==null)return;
if (!Global.MsgDelete()) return;
_examConclusion.Remove(item);
ShowExamConclusion(_examConclusion);
try
{
var task = new Task(() => item?.Delete());
task.Start();
}
catch (AggregateException ae)
{
Global.MsgErr($@"{item.Conclusion} 结论词删除失败！" + ae.Message);
ae.Handle(ex =>
{
// 处理异常
return true; // 返回true表示已处理异常
});
}
}
/// <summary>

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

@ -120,6 +120,12 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>497, 55</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>497, 55</value>
</metadata>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>377, 55</value>
</metadata>
<metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>377, 55</value>
</metadata>
@ -139,18 +145,14 @@
</data>
<data name="TsmiFinishCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAlJJREFUWEfV
lrFP20AUxpNCiIoEAuEwVEBM24WhCimIZKjoWrNARQQjf0K7tWuBuaqABXVpJ5hYSar+A8xBXRmRGFqE
QGoloLx3/i44vjv7HFOp/KQ3vO/ufe9y8Z2dudeUvG9vOMpz3yuQ/h09vY8eztQO/1rGNsrS0+c8zwfN
q8s/9jCk8GR6/dlMrXkZmH+Aoc4gg6Y0KxS9HGQraCF1WZvLD2Qh2yOLK7XDNUgdIX2Q2tFRUQTkdcV+
3T0DeUhmaOvEtiPV4i+weYzUCr8m5kfJB462fRWSgpWRgdjauAmt8WzXA0iJcNz5Ia6nI90P6RZ5zgvF
V9qnvdU8JUafqAZRY0lxxheLxgVUltRL5i6bS9iv5DW+IPXRNZHNKU4pftkGmX+ChRaao/4oRSDkxBRx
Dqs26Aif8DhSfqvV37YJAaQZUmueVj++M9VSv902PWoBjMkojuHHr0e4bmJ204UkUBZQ9urVuAadLkJX
R8/IkeJlY64zi2N8em0jXEP5H8WHBX6fIzXC85TiCGgB78Pz4fETqY8vNi+RRgKDC6SR0LzfPB+pIJwL
qPm2diAl7Enen5FynwNjH0zeR5qObFfW99Nuv/Z+4EHz6ixBg1ZAFlB+FtYUdIW20LkXr1sOpzj/ArKA
7oJR1t2pDyuQ9OTyg3LrriDdCXJhSONJXGBg4uXWGLyuIdnBH5ByEY67MAQ5EVQr/nMOSMmRBhwFd3EM
ciQ0VzzMHLH/uQ38DScNA3Ey6TV2OHC3i+s1EPqjlpbSXONrqFEw2q/X/59M5gZwQwBmYRNKogAAAABJ
RU5ErkJggg==
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft
lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat
dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D
2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW
QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs
d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q
a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f
h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiFinish.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

Write Preview
Loading…
Cancel
Save