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; }
///
- /// 有害因素
+ /// 接害因素(危害因素、有害因素)
///
public string HarmfulFactors { get; set; }
///
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;
}));
}