From 34eb6c7cf5dd7f69fd145850f2e45032ad06ef6e Mon Sep 17 00:00:00 2001
From: luoxingjian <1010378449@qq.com>
Date: Thu, 21 Nov 2024 09:05:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E5=8F=B2=E9=97=AE=E8=AF=8A?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=8E=A5=E5=AE=B3=E5=9B=A0=E7=B4=A0=E3=80=81?=
 =?UTF-8?q?=E5=8D=B1=E5=AE=B3=E5=9B=A0=E7=B4=A0=E3=80=81=E6=9C=89=E5=AE=B3?=
 =?UTF-8?q?=E5=9B=A0=E7=B4=A0=E6=98=AF=E5=90=8C=E4=B8=80=E4=B8=AA=E6=84=8F?=
 =?UTF-8?q?=E6=80=9D=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90=E6=8E=A5?=
 =?UTF-8?q?=E5=AE=B3=E5=9B=A0=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PEIS/Entity/ExamEmploymentHis.cs             | 2 +-
 PEIS/View/Exam/CareerHisInqForm.Designer.cs  | 4 ++--
 PEIS/View/Exam/CareerHisInqForm.cs           | 1 +
 PEIS/View/Exam/EmploymentHisForm.Designer.cs | 2 +-
 PEIS/View/Exam/EmploymentHisForm.cs          | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/PEIS/Entity/ExamEmploymentHis.cs b/PEIS/Entity/ExamEmploymentHis.cs
index 7a1de1e..a177f05 100644
--- a/PEIS/Entity/ExamEmploymentHis.cs
+++ b/PEIS/Entity/ExamEmploymentHis.cs
@@ -38,7 +38,7 @@ namespace PEIS.Entity
         public DateTime EndTime { get; set; }
 
         /// <summary>
-        /// 有害因素
+        /// 接害因素(危害因素、有害因素)
         /// </summary>
         public string HarmfulFactors { get; set; }
         /// <summary>
diff --git a/PEIS/View/Exam/CareerHisInqForm.Designer.cs b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
index 3038d92..bb5f91a 100644
--- a/PEIS/View/Exam/CareerHisInqForm.Designer.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
@@ -290,7 +290,7 @@
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(58, 24);
             this.label7.TabIndex = 12;
-            this.label7.Text = "危害因数";
+            this.label7.Text = "接害因素";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // textBox6
@@ -1210,7 +1210,7 @@
             // 
             this.gridColumn5.AppearanceHeader.Options.UseTextOptions = true;
             this.gridColumn5.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
-            this.gridColumn5.Caption = "有害因素";
+            this.gridColumn5.Caption = "接害因素";
             this.gridColumn5.FieldName = "HarmfulFactors";
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.AllowEdit = false;
diff --git a/PEIS/View/Exam/CareerHisInqForm.cs b/PEIS/View/Exam/CareerHisInqForm.cs
index eb36235..1104e07 100644
--- a/PEIS/View/Exam/CareerHisInqForm.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.cs
@@ -94,6 +94,7 @@ namespace PEIS.View.Exam
                 Workshop = textBox10.Text,
                 WorkUnit = textBox8.Text,
                 WorkType = textBox9.Text,
+                HarmfulFactors= textBox7.Text,
             };
             employmentHisForm.ShowDialog();
             if (employmentHisForm.DialogResult == DialogResult.OK)
diff --git a/PEIS/View/Exam/EmploymentHisForm.Designer.cs b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
index 42acfc1..78f3927 100644
--- a/PEIS/View/Exam/EmploymentHisForm.Designer.cs
+++ b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
@@ -116,7 +116,7 @@
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(100, 23);
             this.label6.TabIndex = 11;
-            this.label6.Text = "有害因素：";
+            this.label6.Text = "接害因素：";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // textBox4
diff --git a/PEIS/View/Exam/EmploymentHisForm.cs b/PEIS/View/Exam/EmploymentHisForm.cs
index 169d38f..2f7d81a 100644
--- a/PEIS/View/Exam/EmploymentHisForm.cs
+++ b/PEIS/View/Exam/EmploymentHisForm.cs
@@ -34,6 +34,7 @@ namespace PEIS.View.Exam
                 textBox1.Text = examEmploy?.WorkUnit;
                 textBox2.Text = examEmploy?.WorkType;
                 textBox3.Text = examEmploy?.Workshop;
+                textBox4.Text = examEmploy?.HarmfulFactors;
             }));
         }