Merge branch 'master' of http://10.2.1.24:10244/xxe/HKCard

HKCardManager/UserPages/MealSegmentSetPage.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.dateTimePicker6 = new System.Windows.Forms.DateTimePicker();
@@ -52,16 +51,6 @@
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // button2
-            // 
-            this.button2.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.button2.Location = new System.Drawing.Point(154, 245);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(113, 35);
-            this.button2.TabIndex = 12;
-            this.button2.Text = "取消";
-            this.button2.UseVisualStyleBackColor = true;
-            // 
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("Microsoft YaHei UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
@@ -226,7 +215,6 @@
             // panel1
             // 
             this.panel1.Controls.Add(this.button1);
-            this.panel1.Controls.Add(this.button2);
             this.panel1.Controls.Add(this.groupBox1);
             this.panel1.Controls.Add(this.groupBox2);
             this.panel1.Controls.Add(this.groupBox3);
@@ -254,8 +242,6 @@
         }
 
         #endregion
-
-        private Button button2;
         private Button button1;
         private GroupBox groupBox3;
         private DateTimePicker dateTimePicker6;

HKCardManager/UserPages/PersonnelEntryPage.Designer.cs

@@ -189,6 +189,7 @@
             this.dataGridView1.RowTemplate.Height = 25;
             this.dataGridView1.Size = new System.Drawing.Size(947, 499);
             this.dataGridView1.TabIndex = 0;
+            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
             // 
             // 名称
             // 
@@ -240,6 +241,7 @@
             this.删除.Name = "删除";
             this.删除.ReadOnly = true;
             this.删除.Text = "删除";
+            this.删除.UseColumnTextForButtonValue = true;
             // 
             // PersonnelEntryPage
             // 

HKCardManager/UserPages/PersonnelEntryPage.cs

@@ -108,8 +108,13 @@ namespace HKCardManager.UserPages
                     });
                     this.Invoke(() =>
                     {
-                        //int len = dataGridView1.Rows.Count-1;
-                        //dataGridView1.Rows[len].Cells[0] = userDto.Name;
+                        dataGridView1.Rows.Add();
+                        int len = dataGridView1.Rows.Count - 1;
+                        dataGridView1.Rows[len].Cells[0].Value = userDto.Name;
+                        dataGridView1.Rows[len].Cells[1].Value = "";
+                        dataGridView1.Rows[len].Cells[2].Value = OrgName;
+                        dataGridView1.Rows[len].Cells[3].Value = userDto.Phone;
+                        dataGridView1.Rows[len].Cells[4].Value = "";
                     });
                     MessageLogNotify.GetInstance.Show($"用户 【{userDto.Name}】 添加成功");
                 }
@@ -118,5 +123,14 @@ namespace HKCardManager.UserPages
             });
 
         }
+
+        private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            int index = dataGridView1.CurrentRow.Index;
+            if (index <= dataGridView1.Rows.Count - 1 && dataGridView1.CurrentCell.Value.ToString() == "删除")
+            {
+                MessageLogNotify.GetInstance.Show($"用户名称：{dataGridView1.Rows[index].Cells[0].Value }");
+            }
+        }
     }
 }