职业史问诊中的接害因素、危害因素、有害因素是同一个意思,统一改成接害因素

dhzzyy
luoxingjian 6 months ago
parent fa440032c6
commit 34eb6c7cf5
  1. 2
      PEIS/Entity/ExamEmploymentHis.cs
  2. 4
      PEIS/View/Exam/CareerHisInqForm.Designer.cs
  3. 1
      PEIS/View/Exam/CareerHisInqForm.cs
  4. 2
      PEIS/View/Exam/EmploymentHisForm.Designer.cs
  5. 1
      PEIS/View/Exam/EmploymentHisForm.cs

@ -38,7 +38,7 @@ namespace PEIS.Entity
public DateTime EndTime { get; set; } public DateTime EndTime { get; set; }
/// <summary> /// <summary>
/// 有害因素 /// 接害因素(危害因素、有害因素)
/// </summary> /// </summary>
public string HarmfulFactors { get; set; } public string HarmfulFactors { get; set; }
/// <summary> /// <summary>

@ -290,7 +290,7 @@
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(58, 24); this.label7.Size = new System.Drawing.Size(58, 24);
this.label7.TabIndex = 12; this.label7.TabIndex = 12;
this.label7.Text = "危害因数"; this.label7.Text = "接害因素";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// textBox6 // textBox6
@ -1210,7 +1210,7 @@
// //
this.gridColumn5.AppearanceHeader.Options.UseTextOptions = true; this.gridColumn5.AppearanceHeader.Options.UseTextOptions = true;
this.gridColumn5.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; this.gridColumn5.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.gridColumn5.Caption = "害因素"; this.gridColumn5.Caption = "害因素";
this.gridColumn5.FieldName = "HarmfulFactors"; this.gridColumn5.FieldName = "HarmfulFactors";
this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.OptionsColumn.AllowEdit = false;

@ -94,6 +94,7 @@ namespace PEIS.View.Exam
Workshop = textBox10.Text, Workshop = textBox10.Text,
WorkUnit = textBox8.Text, WorkUnit = textBox8.Text,
WorkType = textBox9.Text, WorkType = textBox9.Text,
HarmfulFactors= textBox7.Text,
}; };
employmentHisForm.ShowDialog(); employmentHisForm.ShowDialog();
if (employmentHisForm.DialogResult == DialogResult.OK) if (employmentHisForm.DialogResult == DialogResult.OK)

@ -116,7 +116,7 @@
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(100, 23); this.label6.Size = new System.Drawing.Size(100, 23);
this.label6.TabIndex = 11; this.label6.TabIndex = 11;
this.label6.Text = "害因素:"; this.label6.Text = "害因素:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// textBox4 // textBox4

@ -34,6 +34,7 @@ namespace PEIS.View.Exam
textBox1.Text = examEmploy?.WorkUnit; textBox1.Text = examEmploy?.WorkUnit;
textBox2.Text = examEmploy?.WorkType; textBox2.Text = examEmploy?.WorkType;
textBox3.Text = examEmploy?.Workshop; textBox3.Text = examEmploy?.Workshop;
textBox4.Text = examEmploy?.HarmfulFactors;
})); }));
} }

Loading…
Cancel
Save