diff --git a/PEIS/View/Exam/CareerHisInqForm.Designer.cs b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
index 3fe81b0..3038d92 100644
--- a/PEIS/View/Exam/CareerHisInqForm.Designer.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.Designer.cs
@@ -30,7 +30,6 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CareerHisInqForm));
this.panel1 = new System.Windows.Forms.Panel();
- this.button1 = new System.Windows.Forms.Button();
this.textBox12 = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.textBox11 = new System.Windows.Forms.TextBox();
@@ -53,8 +52,6 @@
this.label3 = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
- this.textBox1 = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
this.advPropertyGrid1 = new FastReport.DevComponents.DotNetBar.AdvPropertyGrid();
this.panelMain = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
@@ -66,7 +63,6 @@
this.SmokeState_1 = new System.Windows.Forms.RadioButton();
this.SmokeState_2 = new System.Windows.Forms.RadioButton();
this.SmokeState_3 = new System.Windows.Forms.RadioButton();
- this.button6 = new System.Windows.Forms.Button();
this.Symptom = new System.Windows.Forms.TextBox();
this.label44 = new System.Windows.Forms.Label();
this.Other = new System.Windows.Forms.TextBox();
@@ -115,16 +111,12 @@
this.MarriageDate = new System.Windows.Forms.TextBox();
this.label18 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
- this.button5 = new System.Windows.Forms.Button();
this.SurgicalHistory = new System.Windows.Forms.TextBox();
this.label16 = new System.Windows.Forms.Label();
- this.button4 = new System.Windows.Forms.Button();
this.FamilyHistory = new System.Windows.Forms.TextBox();
this.label15 = new System.Windows.Forms.Label();
- this.button3 = new System.Windows.Forms.Button();
this.PreHisIllness = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
- this.button2 = new System.Windows.Forms.Button();
this.PastHistory = new System.Windows.Forms.TextBox();
this.label13 = new System.Windows.Forms.Label();
this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -163,7 +155,7 @@
//
// panel1
//
- this.panel1.Controls.Add(this.button1);
+ this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.textBox12);
this.panel1.Controls.Add(this.label12);
this.panel1.Controls.Add(this.textBox11);
@@ -186,241 +178,211 @@
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.textBox2);
this.panel1.Controls.Add(this.label2);
- this.panel1.Controls.Add(this.textBox1);
- this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1261, 136);
+ this.panel1.Size = new System.Drawing.Size(1126, 117);
this.panel1.TabIndex = 0;
//
- // button1
- //
- this.button1.Location = new System.Drawing.Point(1048, 85);
- this.button1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(131, 33);
- this.button1.TabIndex = 24;
- this.button1.Text = "完善个人信息";
- this.button1.UseVisualStyleBackColor = true;
- //
// textBox12
//
- this.textBox12.Location = new System.Drawing.Point(911, 90);
+ this.textBox12.Location = new System.Drawing.Point(779, 83);
this.textBox12.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox12.Name = "textBox12";
- this.textBox12.Size = new System.Drawing.Size(103, 23);
+ this.textBox12.Size = new System.Drawing.Size(77, 23);
this.textBox12.TabIndex = 23;
//
// label12
//
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label12.Location = new System.Drawing.Point(820, 90);
+ this.label12.Location = new System.Drawing.Point(715, 81);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(84, 24);
+ this.label12.Size = new System.Drawing.Size(58, 24);
this.label12.TabIndex = 22;
this.label12.Text = "接害工龄";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox11
//
- this.textBox11.Location = new System.Drawing.Point(652, 90);
+ this.textBox11.Location = new System.Drawing.Point(600, 85);
this.textBox11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox11.Name = "textBox11";
- this.textBox11.Size = new System.Drawing.Size(160, 23);
+ this.textBox11.Size = new System.Drawing.Size(82, 23);
this.textBox11.TabIndex = 21;
//
// label11
//
this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label11.Location = new System.Drawing.Point(561, 90);
+ this.label11.Location = new System.Drawing.Point(533, 84);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(84, 24);
+ this.label11.Size = new System.Drawing.Size(58, 24);
this.label11.TabIndex = 20;
this.label11.Text = "总工龄";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox10
//
- this.textBox10.Location = new System.Drawing.Point(393, 90);
+ this.textBox10.Location = new System.Drawing.Point(336, 82);
this.textBox10.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox10.Name = "textBox10";
- this.textBox10.Size = new System.Drawing.Size(160, 23);
+ this.textBox10.Size = new System.Drawing.Size(134, 23);
this.textBox10.TabIndex = 19;
//
// label10
//
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label10.Location = new System.Drawing.Point(302, 90);
+ this.label10.Location = new System.Drawing.Point(267, 81);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(84, 24);
+ this.label10.Size = new System.Drawing.Size(63, 24);
this.label10.TabIndex = 18;
this.label10.Text = "部门/车间";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox9
//
- this.textBox9.Location = new System.Drawing.Point(134, 90);
+ this.textBox9.Location = new System.Drawing.Point(107, 84);
this.textBox9.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox9.Name = "textBox9";
- this.textBox9.Size = new System.Drawing.Size(160, 23);
+ this.textBox9.Size = new System.Drawing.Size(134, 23);
this.textBox9.TabIndex = 17;
//
// label9
//
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label9.Location = new System.Drawing.Point(43, 90);
+ this.label9.Location = new System.Drawing.Point(43, 84);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(84, 24);
+ this.label9.Size = new System.Drawing.Size(58, 24);
this.label9.TabIndex = 16;
this.label9.Text = "工 种";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox8
//
- this.textBox8.Location = new System.Drawing.Point(911, 54);
+ this.textBox8.Location = new System.Drawing.Point(779, 51);
this.textBox8.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox8.Name = "textBox8";
- this.textBox8.Size = new System.Drawing.Size(305, 23);
+ this.textBox8.Size = new System.Drawing.Size(279, 23);
this.textBox8.TabIndex = 15;
//
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label8.Location = new System.Drawing.Point(820, 54);
+ this.label8.Location = new System.Drawing.Point(715, 50);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(84, 24);
+ this.label8.Size = new System.Drawing.Size(58, 24);
this.label8.TabIndex = 14;
this.label8.Text = "单位";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox7
//
- this.textBox7.Location = new System.Drawing.Point(393, 54);
+ this.textBox7.Location = new System.Drawing.Point(336, 51);
this.textBox7.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox7.Name = "textBox7";
- this.textBox7.Size = new System.Drawing.Size(419, 23);
+ this.textBox7.Size = new System.Drawing.Size(341, 23);
this.textBox7.TabIndex = 13;
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(302, 54);
+ this.label7.Location = new System.Drawing.Point(272, 50);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(84, 24);
+ this.label7.Size = new System.Drawing.Size(58, 24);
this.label7.TabIndex = 12;
this.label7.Text = "危害因数";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox6
//
- this.textBox6.Location = new System.Drawing.Point(134, 54);
+ this.textBox6.Location = new System.Drawing.Point(107, 53);
this.textBox6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(160, 23);
+ this.textBox6.Size = new System.Drawing.Size(134, 23);
this.textBox6.TabIndex = 11;
//
// label6
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label6.Location = new System.Drawing.Point(43, 54);
+ this.label6.Location = new System.Drawing.Point(43, 53);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(84, 24);
+ this.label6.Size = new System.Drawing.Size(58, 24);
this.label6.TabIndex = 10;
this.label6.Text = "类 别";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox5
//
- this.textBox5.Location = new System.Drawing.Point(1113, 21);
+ this.textBox5.Location = new System.Drawing.Point(779, 19);
this.textBox5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(103, 23);
+ this.textBox5.Size = new System.Drawing.Size(77, 23);
this.textBox5.TabIndex = 9;
//
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label5.Location = new System.Drawing.Point(1022, 20);
+ this.label5.Location = new System.Drawing.Point(715, 20);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(84, 24);
+ this.label5.Size = new System.Drawing.Size(58, 24);
this.label5.TabIndex = 8;
this.label5.Text = "年 龄";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox4
//
- this.textBox4.Location = new System.Drawing.Point(911, 21);
+ this.textBox4.Location = new System.Drawing.Point(600, 19);
this.textBox4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(103, 23);
+ this.textBox4.Size = new System.Drawing.Size(77, 23);
this.textBox4.TabIndex = 7;
//
// label4
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label4.Location = new System.Drawing.Point(820, 20);
+ this.label4.Location = new System.Drawing.Point(533, 19);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(84, 24);
+ this.label4.Size = new System.Drawing.Size(58, 24);
this.label4.TabIndex = 6;
this.label4.Text = "性 别";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox3
//
- this.textBox3.Location = new System.Drawing.Point(652, 23);
+ this.textBox3.Location = new System.Drawing.Point(336, 20);
this.textBox3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(160, 23);
+ this.textBox3.Size = new System.Drawing.Size(134, 23);
this.textBox3.TabIndex = 5;
//
// label3
//
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label3.Location = new System.Drawing.Point(561, 20);
+ this.label3.Location = new System.Drawing.Point(272, 18);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(84, 24);
+ this.label3.Size = new System.Drawing.Size(58, 24);
this.label3.TabIndex = 4;
this.label3.Text = "姓 名";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox2
//
- this.textBox2.Location = new System.Drawing.Point(393, 21);
+ this.textBox2.Location = new System.Drawing.Point(107, 21);
this.textBox2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(160, 23);
+ this.textBox2.Size = new System.Drawing.Size(134, 23);
this.textBox2.TabIndex = 3;
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(302, 20);
+ this.label2.Location = new System.Drawing.Point(43, 20);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(84, 24);
+ this.label2.Size = new System.Drawing.Size(58, 24);
this.label2.TabIndex = 2;
this.label2.Text = "体检编号";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // textBox1
- //
- this.textBox1.Location = new System.Drawing.Point(134, 21);
- this.textBox1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(160, 23);
- this.textBox1.TabIndex = 1;
- //
- // label1
- //
- this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(43, 20);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(84, 24);
- this.label1.TabIndex = 0;
- this.label1.Text = "流水号";
- this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
- //
// advPropertyGrid1
//
this.advPropertyGrid1.GridLinesColor = System.Drawing.Color.WhiteSmoke;
@@ -434,6 +396,7 @@
// panelMain
//
this.panelMain.AutoScroll = true;
+ this.panelMain.BackColor = System.Drawing.Color.White;
this.panelMain.Controls.Add(this.groupBox1);
this.panelMain.Controls.Add(this.tabControl1);
this.panelMain.Controls.Add(this.panel1);
@@ -441,14 +404,14 @@
this.panelMain.Location = new System.Drawing.Point(0, 0);
this.panelMain.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelMain.Name = "panelMain";
- this.panelMain.Size = new System.Drawing.Size(1261, 932);
+ this.panelMain.Size = new System.Drawing.Size(1126, 892);
this.panelMain.TabIndex = 2;
//
// groupBox1
//
+ this.groupBox1.BackColor = System.Drawing.Color.White;
this.groupBox1.Controls.Add(this.panelDrink);
this.groupBox1.Controls.Add(this.panelSmoke);
- this.groupBox1.Controls.Add(this.button6);
this.groupBox1.Controls.Add(this.Symptom);
this.groupBox1.Controls.Add(this.label44);
this.groupBox1.Controls.Add(this.Other);
@@ -497,25 +460,21 @@
this.groupBox1.Controls.Add(this.MarriageDate);
this.groupBox1.Controls.Add(this.label18);
this.groupBox1.Controls.Add(this.label17);
- this.groupBox1.Controls.Add(this.button5);
this.groupBox1.Controls.Add(this.SurgicalHistory);
this.groupBox1.Controls.Add(this.label16);
- this.groupBox1.Controls.Add(this.button4);
this.groupBox1.Controls.Add(this.FamilyHistory);
this.groupBox1.Controls.Add(this.label15);
- this.groupBox1.Controls.Add(this.button3);
this.groupBox1.Controls.Add(this.PreHisIllness);
this.groupBox1.Controls.Add(this.label14);
- this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.PastHistory);
this.groupBox1.Controls.Add(this.label13);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.Location = new System.Drawing.Point(0, 319);
+ this.groupBox1.Location = new System.Drawing.Point(0, 271);
this.groupBox1.Margin = new System.Windows.Forms.Padding(19, 4, 3, 4);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(19, 4, 3, 4);
- this.groupBox1.Size = new System.Drawing.Size(1261, 613);
+ this.groupBox1.Size = new System.Drawing.Size(1126, 621);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "问诊";
@@ -528,7 +487,7 @@
this.panelDrink.Location = new System.Drawing.Point(134, 425);
this.panelDrink.Name = "panelDrink";
this.panelDrink.Size = new System.Drawing.Size(220, 40);
- this.panelDrink.TabIndex = 96;
+ this.panelDrink.TabIndex = 79;
//
// DrinkState_1
//
@@ -573,7 +532,7 @@
this.panelSmoke.Location = new System.Drawing.Point(134, 384);
this.panelSmoke.Name = "panelSmoke";
this.panelSmoke.Size = new System.Drawing.Size(220, 40);
- this.panelSmoke.TabIndex = 95;
+ this.panelSmoke.TabIndex = 73;
//
// SmokeState_1
//
@@ -610,16 +569,6 @@
this.SmokeState_3.Text = "经常吸";
this.SmokeState_3.UseVisualStyleBackColor = true;
//
- // button6
- //
- this.button6.Location = new System.Drawing.Point(1049, 565);
- this.button6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(72, 33);
- this.button6.TabIndex = 94;
- this.button6.Text = "选择";
- this.button6.UseVisualStyleBackColor = true;
- //
// Symptom
//
this.Symptom.Location = new System.Drawing.Point(134, 567);
@@ -1061,16 +1010,6 @@
this.label17.Text = "五、结婚史：";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // button5
- //
- this.button5.Location = new System.Drawing.Point(1049, 142);
- this.button5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(72, 33);
- this.button5.TabIndex = 34;
- this.button5.Text = "选择";
- this.button5.UseVisualStyleBackColor = true;
- //
// SurgicalHistory
//
this.SurgicalHistory.Location = new System.Drawing.Point(134, 144);
@@ -1090,16 +1029,6 @@
this.label16.Text = "四、手术史：";
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // button4
- //
- this.button4.Location = new System.Drawing.Point(1049, 105);
- this.button4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(72, 33);
- this.button4.TabIndex = 31;
- this.button4.Text = "选择";
- this.button4.UseVisualStyleBackColor = true;
- //
// FamilyHistory
//
this.FamilyHistory.Location = new System.Drawing.Point(134, 108);
@@ -1119,16 +1048,6 @@
this.label15.Text = "三、家族史：";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // button3
- //
- this.button3.Location = new System.Drawing.Point(1049, 70);
- this.button3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(72, 33);
- this.button3.TabIndex = 28;
- this.button3.Text = "选择";
- this.button3.UseVisualStyleBackColor = true;
- //
// PreHisIllness
//
this.PreHisIllness.Location = new System.Drawing.Point(134, 72);
@@ -1148,16 +1067,6 @@
this.label14.Text = "二、现病史：";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // button2
- //
- this.button2.Location = new System.Drawing.Point(1049, 33);
- this.button2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(72, 33);
- this.button2.TabIndex = 25;
- this.button2.Text = "选择";
- this.button2.UseVisualStyleBackColor = true;
- //
// PastHistory
//
this.PastHistory.Location = new System.Drawing.Point(134, 38);
@@ -1170,7 +1079,7 @@
// label13
//
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label13.Location = new System.Drawing.Point(22, 42);
+ this.label13.Location = new System.Drawing.Point(22, 36);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(105, 24);
this.label13.TabIndex = 1;
@@ -1182,12 +1091,12 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
- this.tabControl1.Location = new System.Drawing.Point(0, 136);
+ this.tabControl1.Location = new System.Drawing.Point(0, 117);
this.tabControl1.Margin = new System.Windows.Forms.Padding(7, 4, 3, 4);
this.tabControl1.Name = "tabControl1";
this.tabControl1.Padding = new System.Drawing.Point(16, 3);
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1261, 183);
+ this.tabControl1.Size = new System.Drawing.Size(1126, 154);
this.tabControl1.TabIndex = 1;
//
// tabPage1
@@ -1199,7 +1108,7 @@
this.tabPage1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.tabPage1.Size = new System.Drawing.Size(1253, 153);
+ this.tabPage1.Size = new System.Drawing.Size(1118, 124);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "职业史表";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -1212,7 +1121,7 @@
this.gridOccupation.MainView = this.gVEmploymentHis;
this.gridOccupation.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.gridOccupation.Name = "gridOccupation";
- this.gridOccupation.Size = new System.Drawing.Size(1247, 120);
+ this.gridOccupation.Size = new System.Drawing.Size(1112, 91);
this.gridOccupation.TabIndex = 0;
this.gridOccupation.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gVEmploymentHis});
@@ -1229,6 +1138,7 @@
this.gridColumn7});
this.gVEmploymentHis.GridControl = this.gridOccupation;
this.gVEmploymentHis.Name = "gVEmploymentHis";
+ this.gVEmploymentHis.OptionsView.ColumnAutoWidth = false;
this.gVEmploymentHis.OptionsView.ShowGroupExpandCollapseButtons = false;
this.gVEmploymentHis.OptionsView.ShowGroupPanel = false;
//
@@ -1241,9 +1151,12 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.OptionsColumn.AllowMove = false;
+ this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn1.OptionsFilter.AllowAutoFilter = false;
+ this.gridColumn1.OptionsFilter.AllowFilter = false;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 153;
//
// gridColumn2
//
@@ -1254,9 +1167,12 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.OptionsColumn.AllowMove = false;
+ this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn2.OptionsFilter.AllowAutoFilter = false;
this.gridColumn2.OptionsFilter.AllowFilter = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 160;
//
// gridColumn3
//
@@ -1267,9 +1183,12 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.OptionsColumn.AllowMove = false;
+ this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn3.OptionsFilter.AllowAutoFilter = false;
this.gridColumn3.OptionsFilter.AllowFilter = false;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 170;
//
// gridColumn4
//
@@ -1280,9 +1199,12 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.OptionsColumn.AllowMove = false;
+ this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn4.OptionsFilter.AllowAutoFilter = false;
+ this.gridColumn4.OptionsFilter.AllowFilter = false;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 170;
//
// gridColumn5
//
@@ -1293,9 +1215,12 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.AllowEdit = false;
this.gridColumn5.OptionsColumn.AllowMove = false;
+ this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn5.OptionsFilter.AllowAutoFilter = false;
this.gridColumn5.OptionsFilter.AllowFilter = false;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 200;
//
// gridColumn6
//
@@ -1306,9 +1231,12 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.AllowEdit = false;
this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn6.OptionsFilter.AllowAutoFilter = false;
this.gridColumn6.OptionsFilter.AllowFilter = false;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 240;
//
// gridColumn7
//
@@ -1317,16 +1245,19 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.AllowEdit = false;
this.gridColumn7.OptionsColumn.AllowMove = false;
+ this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn7.OptionsFilter.AllowAutoFilter = false;
this.gridColumn7.OptionsFilter.AllowFilter = false;
//
// menuStrip1
//
+ this.menuStrip1.BackColor = System.Drawing.Color.White;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolMenuItem_Add,
this.toolStMenuItem_Del});
this.menuStrip1.Location = new System.Drawing.Point(3, 4);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Size = new System.Drawing.Size(1247, 25);
+ this.menuStrip1.Size = new System.Drawing.Size(1112, 25);
this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1";
//
@@ -1351,20 +1282,21 @@
this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.tabPage2.Size = new System.Drawing.Size(1253, 153);
+ this.tabPage2.Size = new System.Drawing.Size(1118, 124);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "放射职业史表";
this.tabPage2.UseVisualStyleBackColor = true;
//
// panelButtom
//
+ this.panelButtom.BackColor = System.Drawing.Color.White;
this.panelButtom.Controls.Add(this.CancelBtn);
this.panelButtom.Controls.Add(this.ConfirmBtn);
this.panelButtom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelButtom.Location = new System.Drawing.Point(0, 932);
+ this.panelButtom.Location = new System.Drawing.Point(0, 892);
this.panelButtom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panelButtom.Name = "panelButtom";
- this.panelButtom.Size = new System.Drawing.Size(1261, 50);
+ this.panelButtom.Size = new System.Drawing.Size(1126, 43);
this.panelButtom.TabIndex = 3;
//
// CancelBtn
@@ -1373,7 +1305,7 @@
this.CancelBtn.Location = new System.Drawing.Point(701, 0);
this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
this.CancelBtn.Name = "CancelBtn";
- this.CancelBtn.Size = new System.Drawing.Size(91, 48);
+ this.CancelBtn.Size = new System.Drawing.Size(91, 40);
this.CancelBtn.TabIndex = 19;
this.CancelBtn.Text = "取消";
this.CancelBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1383,10 +1315,10 @@
// ConfirmBtn
//
this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image")));
- this.ConfirmBtn.Location = new System.Drawing.Point(426, 0);
+ this.ConfirmBtn.Location = new System.Drawing.Point(420, 0);
this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4);
this.ConfirmBtn.Name = "ConfirmBtn";
- this.ConfirmBtn.Size = new System.Drawing.Size(90, 48);
+ this.ConfirmBtn.Size = new System.Drawing.Size(90, 40);
this.ConfirmBtn.TabIndex = 18;
this.ConfirmBtn.Text = "确认";
this.ConfirmBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1420,7 +1352,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1261, 982);
+ this.ClientSize = new System.Drawing.Size(1126, 935);
this.Controls.Add(this.panelMain);
this.Controls.Add(this.panelButtom);
this.Controls.Add(this.advPropertyGrid1);
@@ -1456,8 +1388,6 @@
#endregion
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label label1;
- private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox textBox4;
@@ -1466,7 +1396,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox textBox12;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox textBox11;
@@ -1498,16 +1427,12 @@
private System.Windows.Forms.TextBox MarriageDate;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.Label label17;
- private System.Windows.Forms.Button button5;
private System.Windows.Forms.TextBox SurgicalHistory;
private System.Windows.Forms.Label label16;
- private System.Windows.Forms.Button button4;
private System.Windows.Forms.TextBox FamilyHistory;
private System.Windows.Forms.Label label15;
- private System.Windows.Forms.Button button3;
private System.Windows.Forms.TextBox PreHisIllness;
private System.Windows.Forms.Label label14;
- private System.Windows.Forms.Button button2;
private System.Windows.Forms.TextBox PastHistory;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label34;
@@ -1533,7 +1458,6 @@
private System.Windows.Forms.Label label36;
private System.Windows.Forms.TextBox PrematureDelivery;
private System.Windows.Forms.Label label35;
- private System.Windows.Forms.Button button6;
private System.Windows.Forms.TextBox Symptom;
private System.Windows.Forms.Label label44;
private System.Windows.Forms.TextBox Other;
diff --git a/PEIS/View/Exam/CareerHisInqForm.cs b/PEIS/View/Exam/CareerHisInqForm.cs
index 535b4d5..eb36235 100644
--- a/PEIS/View/Exam/CareerHisInqForm.cs
+++ b/PEIS/View/Exam/CareerHisInqForm.cs
@@ -26,7 +26,7 @@ namespace PEIS.View.Exam
/// 职业史问诊
///
/// 体检患者表id
- public CareerHisInqForm(Int64 eID)
+ public CareerHisInqForm(Int32 eID)
{
InitializeComponent();
EID = eID;
@@ -34,12 +34,50 @@ namespace PEIS.View.Exam
CancelBtn.Click += CancelBtn_Click;
toolMenuItem_Add.Click += ToolMenuItem_Add_Click;
toolStMenuItem_Del.Click += ToolStMenuItem_Del_Click;
+ SmokeState_1.CheckedChanged += SmokeState_1_CheckedChanged;
+ DrinkState_1.CheckedChanged += DrinkState_1_CheckedChanged;
Shown += CareerHisInqForm_Shown;
-
+
+ }
+
+ private void DrinkState_1_CheckedChanged(object sender, EventArgs e)
+ {
+ var radioButton = sender as RadioButton;
+ if (radioButton.Checked)
+ {
+ Invoke(new Action(() => { DrinkQuantity.Text = ""; DrinkQuantity.Enabled = false; }));
+ Invoke(new Action(() => { DrinkYears.Text = ""; DrinkYears.Enabled = false; }));
+ }
+ else {
+ Invoke(new Action(() => { DrinkQuantity.Enabled = true; }));
+ Invoke(new Action(() => { DrinkYears.Enabled = true; }));
+ }
+ }
+
+ private void SmokeState_1_CheckedChanged(object sender, EventArgs e)
+ {
+ var radioButton = sender as RadioButton;
+ if (radioButton.Checked)
+ {
+ Invoke(new Action(() => { SmokeQuantity.Text = ""; SmokeQuantity.Enabled = false; }));
+ Invoke(new Action(() => { SmokeYears.Text = ""; SmokeYears.Enabled = false; }));
+ Invoke(new Action(() => { SmokeMonths.Text = ""; SmokeMonths.Enabled = false; }));
+ }
+ else {
+ Invoke(new Action(() => { SmokeQuantity.Enabled = true; }));
+ Invoke(new Action(() => { SmokeYears.Enabled = true; }));
+ Invoke(new Action(() => { SmokeMonths.Enabled = true; }));
+ }
}
private void CareerHisInqForm_Shown(object sender, EventArgs e)
{
+ Invoke(new Action(() => {
+ SmokeState_2.Checked = true;
+ DrinkState_2.Checked = true;
+ SmokeState_1.Checked = true;
+ DrinkState_1.Checked = true;
+ }));
ThreadPool.QueueUserWorkItem(state =>
{
LoadPatients(EID);
@@ -51,6 +89,12 @@ namespace PEIS.View.Exam
private void ToolMenuItem_Add_Click(object sender, EventArgs e)
{
var employmentHisForm = new EmploymentHisForm(EID);
+ employmentHisForm.examEmploy = new ExamEmploymentHis()
+ {
+ Workshop = textBox10.Text,
+ WorkUnit = textBox8.Text,
+ WorkType = textBox9.Text,
+ };
employmentHisForm.ShowDialog();
if (employmentHisForm.DialogResult == DialogResult.OK)
{
@@ -92,7 +136,7 @@ namespace PEIS.View.Exam
{
if (patient!=null)
{
- Invoke(new Action(() => textBox1.Text = patient.ID.ToString()));
+ //Invoke(new Action(() => textBox1.Text = patient.ID.ToString()));
Invoke(new Action(() => textBox2.Text= patient.ID.ToString()));
Invoke(new Action(() => textBox3.Text = patient.Name));
Invoke(new Action(() => textBox4.Text = patient.Sex == "1" ? "男" : "女"));
@@ -104,9 +148,24 @@ namespace PEIS.View.Exam
//Invoke(new Action(() =>textBox10.Text = ))
//Invoke(new Action(() =>textBox11.Text = patient.WorkYears))
//Invoke(new Action(() =>textBox12.Text = ))
+
+ if (patient.Sex == "1") Sexman();
+
+
}
}
-
+ public void Sexman()
+ {
+ Invoke(new Action(() => { Menarche.Text = ""; Menarche.Enabled = false; }));
+ Invoke(new Action(() => { MenarchePeriod.Text = ""; MenarchePeriod.Enabled = false; }));
+ Invoke(new Action(() => { MenarcheCycle.Text = ""; MenarcheCycle.Enabled = false; }));
+ Invoke(new Action(() => { LastMenstrualPod.Text = ""; LastMenstrualPod.Enabled = false; }));
+ Invoke(new Action(() => { ExistingChildren.Text = ""; ExistingChildren.Enabled = false; }));
+ Invoke(new Action(() => { Abortion.Text = ""; Abortion.Enabled = false; }));
+ Invoke(new Action(() => { PrematureDelivery.Text = ""; PrematureDelivery.Enabled = false; }));
+ Invoke(new Action(() => { Stillbirth.Text = ""; Stillbirth.Enabled = false; }));
+ Invoke(new Action(() => { AbnormalFetus.Text = ""; AbnormalFetus.Enabled = false; }));
+ }
//职业史问诊
public event EventHandler> GetCareerHisInq;
public void ShowExamCareerHisInq(ExamCareerHisInq examCareer)
@@ -140,7 +199,7 @@ namespace PEIS.View.Exam
}
Invoke(new Action(() => gridOccupation.DataSource = null));
Invoke(new Action(() =>{gridOccupation.DataSource = list; }));
- Invoke(new Action(() => gVEmploymentHis.BestFitColumns()));
+ //Invoke(new Action(() => gVEmploymentHis.BestFitColumns()));
}
@@ -260,5 +319,7 @@ namespace PEIS.View.Exam
{
return new CareerHisInqPresenter(this);
}
+
+
}
}
diff --git a/PEIS/View/Exam/EmploymentHisForm.Designer.cs b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
index edfceee..42acfc1 100644
--- a/PEIS/View/Exam/EmploymentHisForm.Designer.cs
+++ b/PEIS/View/Exam/EmploymentHisForm.Designer.cs
@@ -30,14 +30,14 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EmploymentHisForm));
this.panel1 = new System.Windows.Forms.Panel();
+ this.dateEdit2 = new System.Windows.Forms.DateTimePicker();
+ this.dateEdit1 = new System.Windows.Forms.DateTimePicker();
this.textBox5 = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.textBox4 = new System.Windows.Forms.TextBox();
- this.dateEdit2 = new DevExpress.XtraEditors.DateEdit();
this.label5 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
this.textBox3 = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
@@ -48,23 +48,20 @@
this.CancelBtn = new System.Windows.Forms.Button();
this.ConfirmBtn = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit();
this.panel2.SuspendLayout();
this.SuspendLayout();
//
// panel1
//
+ this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.dateEdit2);
+ this.panel1.Controls.Add(this.dateEdit1);
this.panel1.Controls.Add(this.textBox5);
this.panel1.Controls.Add(this.label7);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.textBox4);
- this.panel1.Controls.Add(this.dateEdit2);
this.panel1.Controls.Add(this.label5);
this.panel1.Controls.Add(this.label4);
- this.panel1.Controls.Add(this.dateEdit1);
this.panel1.Controls.Add(this.textBox3);
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.textBox2);
@@ -74,13 +71,27 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(461, 270);
+ this.panel1.Size = new System.Drawing.Size(461, 288);
this.panel1.TabIndex = 0;
//
+ // dateEdit2
+ //
+ this.dateEdit2.Location = new System.Drawing.Point(129, 38);
+ this.dateEdit2.Name = "dateEdit2";
+ this.dateEdit2.Size = new System.Drawing.Size(222, 21);
+ this.dateEdit2.TabIndex = 1;
+ //
+ // dateEdit1
+ //
+ this.dateEdit1.Location = new System.Drawing.Point(129, 11);
+ this.dateEdit1.Name = "dateEdit1";
+ this.dateEdit1.Size = new System.Drawing.Size(222, 21);
+ this.dateEdit1.TabIndex = 0;
+ //
// textBox5
//
this.textBox5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox5.Location = new System.Drawing.Point(129, 211);
+ this.textBox5.Location = new System.Drawing.Point(129, 215);
this.textBox5.Multiline = true;
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(222, 53);
@@ -90,7 +101,7 @@
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label7.Location = new System.Drawing.Point(23, 209);
+ this.label7.Location = new System.Drawing.Point(23, 215);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(100, 23);
this.label7.TabIndex = 12;
@@ -101,7 +112,7 @@
//
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label6.Location = new System.Drawing.Point(23, 145);
+ this.label6.Location = new System.Drawing.Point(23, 155);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(100, 23);
this.label6.TabIndex = 11;
@@ -111,31 +122,17 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(129, 147);
+ this.textBox4.Location = new System.Drawing.Point(129, 155);
this.textBox4.Multiline = true;
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(222, 53);
this.textBox4.TabIndex = 10;
//
- // dateEdit2
- //
- this.dateEdit2.EditValue = null;
- this.dateEdit2.Location = new System.Drawing.Point(129, 120);
- this.dateEdit2.Name = "dateEdit2";
- this.dateEdit2.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.dateEdit2.Properties.Appearance.Options.UseFont = true;
- this.dateEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit2.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit2.Size = new System.Drawing.Size(222, 24);
- this.dateEdit2.TabIndex = 9;
- //
// label5
//
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label5.Location = new System.Drawing.Point(23, 117);
+ this.label5.Location = new System.Drawing.Point(23, 38);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(100, 23);
this.label5.TabIndex = 8;
@@ -146,31 +143,17 @@
//
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label4.Location = new System.Drawing.Point(23, 91);
+ this.label4.Location = new System.Drawing.Point(23, 11);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(100, 23);
this.label4.TabIndex = 7;
this.label4.Text = "起始时间：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
- // dateEdit1
- //
- this.dateEdit1.EditValue = null;
- this.dateEdit1.Location = new System.Drawing.Point(129, 94);
- this.dateEdit1.Name = "dateEdit1";
- this.dateEdit1.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.dateEdit1.Properties.Appearance.Options.UseFont = true;
- this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.dateEdit1.Size = new System.Drawing.Size(222, 24);
- this.dateEdit1.TabIndex = 6;
- //
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(129, 67);
+ this.textBox3.Location = new System.Drawing.Point(129, 126);
this.textBox3.Name = "textBox3";
this.textBox3.Size = new System.Drawing.Size(222, 23);
this.textBox3.TabIndex = 5;
@@ -179,7 +162,7 @@
//
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label3.Location = new System.Drawing.Point(23, 64);
+ this.label3.Location = new System.Drawing.Point(23, 126);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(100, 23);
this.label3.TabIndex = 4;
@@ -189,16 +172,16 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(129, 40);
+ this.textBox2.Location = new System.Drawing.Point(129, 97);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(222, 23);
- this.textBox2.TabIndex = 3;
+ this.textBox2.TabIndex = 4;
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label2.Location = new System.Drawing.Point(23, 38);
+ this.label2.Location = new System.Drawing.Point(23, 95);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(100, 23);
this.label2.TabIndex = 2;
@@ -209,29 +192,30 @@
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
- this.label1.Location = new System.Drawing.Point(23, 15);
+ this.label1.Location = new System.Drawing.Point(23, 69);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(100, 23);
this.label1.TabIndex = 1;
- this.label1.Text = "单位：";
+ this.label1.Text = "工作单位：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(129, 15);
+ this.textBox1.Location = new System.Drawing.Point(129, 68);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(222, 23);
- this.textBox1.TabIndex = 0;
+ this.textBox1.TabIndex = 3;
//
// panel2
//
+ this.panel2.BackColor = System.Drawing.Color.White;
this.panel2.Controls.Add(this.CancelBtn);
this.panel2.Controls.Add(this.ConfirmBtn);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel2.Location = new System.Drawing.Point(0, 270);
+ this.panel2.Location = new System.Drawing.Point(0, 288);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(461, 57);
+ this.panel2.Size = new System.Drawing.Size(461, 38);
this.panel2.TabIndex = 1;
//
// CancelBtn
@@ -264,7 +248,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(461, 327);
+ this.ClientSize = new System.Drawing.Size(461, 326);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
@@ -273,10 +257,6 @@
this.Text = "职业史";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties.CalendarTimeProperties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit();
this.panel2.ResumeLayout(false);
this.ResumeLayout(false);
@@ -292,8 +272,6 @@
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Label label2;
- private DevExpress.XtraEditors.DateEdit dateEdit1;
- private DevExpress.XtraEditors.DateEdit dateEdit2;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label6;
@@ -302,5 +280,7 @@
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Button ConfirmBtn;
private System.Windows.Forms.Button CancelBtn;
+ private System.Windows.Forms.DateTimePicker dateEdit2;
+ private System.Windows.Forms.DateTimePicker dateEdit1;
}
}
\ No newline at end of file
diff --git a/PEIS/View/Exam/EmploymentHisForm.cs b/PEIS/View/Exam/EmploymentHisForm.cs
index c431e93..169d38f 100644
--- a/PEIS/View/Exam/EmploymentHisForm.cs
+++ b/PEIS/View/Exam/EmploymentHisForm.cs
@@ -17,13 +17,26 @@ namespace PEIS.View.Exam
public partial class EmploymentHisForm : Form
{
private Int64 PID;
+ public ExamEmploymentHis examEmploy;
public EmploymentHisForm(Int64 eID)
{
InitializeComponent();
PID = eID;
ConfirmBtn.Click += ConfirmBtn_Click;
CancelBtn.Click += (sender, e)=>{ DialogResult = DialogResult.Cancel; };
+ Shown += EmploymentHisForm_Shown;
}
+
+ private void EmploymentHisForm_Shown(object sender, EventArgs e)
+ {
+ Invoke(new Action(() =>
+ {
+ textBox1.Text = examEmploy?.WorkUnit;
+ textBox2.Text = examEmploy?.WorkType;
+ textBox3.Text = examEmploy?.Workshop;
+ }));
+ }
+
private void ConfirmBtn_Click(object sender, EventArgs e)
{
ExamEmploymentHis examEmployment = new ExamEmploymentHis();
@@ -31,28 +44,32 @@ namespace PEIS.View.Exam
if (string.IsNullOrWhiteSpace(textBox1.Text))
{
Global.Msg("info", "请填写工作单位");
+ textBox1.Focus();
return;
}
- if (dateEdit1.EditValue==null||dateEdit1.EditValue == DBNull.Value)
+ if (dateEdit1.Value==null)
{
Global.Msg("info", "请填写开始时间");
+ dateEdit1.Focus();
return;
}
- if (dateEdit2.EditValue == null || dateEdit2.EditValue == DBNull.Value)
+ if (dateEdit2.Value == null)
{
Global.Msg("info", "请填写结束时间");
+ dateEdit2.Focus();
return;
}
- if (dateEdit2.DateTime< dateEdit1.DateTime)
+ if (dateEdit2.Value < dateEdit1.Value)
{
Global.Msg("info", "结束时间不能小于开始时间");
+ dateEdit2.Focus();
return;
}
examEmployment.WorkUnit = textBox1.Text.Trim();
examEmployment.WorkType = textBox2.Text.Trim();
examEmployment.Workshop= textBox3.Text.Trim();
- examEmployment.StartTime = dateEdit1.DateTime;
- examEmployment.EndTime = dateEdit2.DateTime;
+ examEmployment.StartTime = dateEdit1.Value;
+ examEmployment.EndTime = dateEdit2.Value;
examEmployment.HarmfulFactors= textBox4.Text.Trim();
examEmployment.ProtectiveMeasures = textBox5.Text.Trim();
var result = examEmployment.Save();