修改权限设置BUG，插入前删除条件限制

UAS-MES/FunctionCode/Employee/Employee_ChooseUserToGroup.Designer.cs

@@ -66,18 +66,20 @@
             // 
             this.ug_code_title.AutoSize = true;
             this.ug_code_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title.Location = new System.Drawing.Point(116, 10);
+            this.ug_code_title.Location = new System.Drawing.Point(155, 12);
+            this.ug_code_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_title.Name = "ug_code_title";
-            this.ug_code_title.Size = new System.Drawing.Size(0, 21);
+            this.ug_code_title.Size = new System.Drawing.Size(0, 27);
             this.ug_code_title.TabIndex = 235;
             // 
             // ug_code_title_label
             // 
             this.ug_code_title_label.AutoSize = true;
             this.ug_code_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_code_title_label.Location = new System.Drawing.Point(23, 10);
+            this.ug_code_title_label.Location = new System.Drawing.Point(31, 12);
+            this.ug_code_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_code_title_label.Name = "ug_code_title_label";
-            this.ug_code_title_label.Size = new System.Drawing.Size(90, 21);
+            this.ug_code_title_label.Size = new System.Drawing.Size(112, 27);
             this.ug_code_title_label.TabIndex = 236;
             this.ug_code_title_label.Text = "用户组编号";
             // 
@@ -85,9 +87,10 @@
             // 
             this.ug_name_title.AutoSize = true;
             this.ug_name_title.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title.Location = new System.Drawing.Point(116, 42);
+            this.ug_name_title.Location = new System.Drawing.Point(155, 52);
+            this.ug_name_title.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_title.Name = "ug_name_title";
-            this.ug_name_title.Size = new System.Drawing.Size(0, 21);
+            this.ug_name_title.Size = new System.Drawing.Size(0, 27);
             this.ug_name_title.TabIndex = 238;
             // 
             // label2
@@ -95,9 +98,10 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(23, 134);
+            this.label2.Location = new System.Drawing.Point(31, 168);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(74, 21);
+            this.label2.Size = new System.Drawing.Size(92, 27);
             this.label2.TabIndex = 242;
             this.label2.Text = "组内成员";
             // 
@@ -105,9 +109,10 @@
             // 
             this.em_name3_label.AutoSize = true;
             this.em_name3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name3_label.Location = new System.Drawing.Point(23, 104);
+            this.em_name3_label.Location = new System.Drawing.Point(31, 130);
+            this.em_name3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name3_label.Name = "em_name3_label";
-            this.em_name3_label.Size = new System.Drawing.Size(74, 21);
+            this.em_name3_label.Size = new System.Drawing.Size(92, 27);
             this.em_name3_label.TabIndex = 246;
             this.em_name3_label.Text = "用户名称";
             // 
@@ -115,9 +120,10 @@
             // 
             this.em_code3_label.AutoSize = true;
             this.em_code3_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code3_label.Location = new System.Drawing.Point(23, 72);
+            this.em_code3_label.Location = new System.Drawing.Point(31, 90);
+            this.em_code3_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code3_label.Name = "em_code3_label";
-            this.em_code3_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code3_label.Size = new System.Drawing.Size(92, 27);
             this.em_code3_label.TabIndex = 244;
             this.em_code3_label.Text = "用户编号";
             // 
@@ -125,9 +131,10 @@
             // 
             this.em_name2_label.AutoSize = true;
             this.em_name2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_name2_label.Location = new System.Drawing.Point(480, 104);
+            this.em_name2_label.Location = new System.Drawing.Point(640, 130);
+            this.em_name2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_name2_label.Name = "em_name2_label";
-            this.em_name2_label.Size = new System.Drawing.Size(74, 21);
+            this.em_name2_label.Size = new System.Drawing.Size(92, 27);
             this.em_name2_label.TabIndex = 251;
             this.em_name2_label.Text = "用户名称";
             // 
@@ -135,9 +142,10 @@
             // 
             this.em_code2_label.AutoSize = true;
             this.em_code2_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.em_code2_label.Location = new System.Drawing.Point(480, 72);
+            this.em_code2_label.Location = new System.Drawing.Point(640, 90);
+            this.em_code2_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.em_code2_label.Name = "em_code2_label";
-            this.em_code2_label.Size = new System.Drawing.Size(74, 21);
+            this.em_code2_label.Size = new System.Drawing.Size(92, 27);
             this.em_code2_label.TabIndex = 249;
             this.em_code2_label.Text = "用户编号";
             // 
@@ -146,9 +154,10 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.Blue;
-            this.label6.Location = new System.Drawing.Point(480, 134);
+            this.label6.Location = new System.Drawing.Point(640, 168);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(74, 21);
+            this.label6.Size = new System.Drawing.Size(92, 27);
             this.label6.TabIndex = 248;
             this.label6.Text = "组外成员";
             // 
@@ -156,9 +165,10 @@
             // 
             this.ug_name_title_label.AutoSize = true;
             this.ug_name_title_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_title_label.Location = new System.Drawing.Point(23, 42);
+            this.ug_name_title_label.Location = new System.Drawing.Point(31, 52);
+            this.ug_name_title_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_title_label.Name = "ug_name_title_label";
-            this.ug_name_title_label.Size = new System.Drawing.Size(58, 21);
+            this.ug_name_title_label.Size = new System.Drawing.Size(72, 27);
             this.ug_name_title_label.TabIndex = 257;
             this.ug_name_title_label.Text = "用户组";
             // 
@@ -169,12 +179,13 @@
             this.em_code2.Condition = null;
             this.em_code2.DBTitle = null;
             this.em_code2.FormName = null;
-            this.em_code2.Location = new System.Drawing.Point(579, 72);
+            this.em_code2.Location = new System.Drawing.Point(772, 90);
+            this.em_code2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.em_code2.Name = "em_code2";
             this.em_code2.Power = null;
             this.em_code2.SelectField = null;
             this.em_code2.SetValueField = null;
-            this.em_code2.Size = new System.Drawing.Size(164, 20);
+            this.em_code2.Size = new System.Drawing.Size(226, 25);
             this.em_code2.TabIndex = 259;
             this.em_code2.TableName = null;
             this.em_code2.Tag = "em_code";
@@ -187,12 +198,13 @@
             this.em_code3.Condition = null;
             this.em_code3.DBTitle = null;
             this.em_code3.FormName = null;
-            this.em_code3.Location = new System.Drawing.Point(115, 72);
+            this.em_code3.Location = new System.Drawing.Point(153, 90);
+            this.em_code3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.em_code3.Name = "em_code3";
             this.em_code3.Power = null;
             this.em_code3.SelectField = null;
             this.em_code3.SetValueField = null;
-            this.em_code3.Size = new System.Drawing.Size(167, 21);
+            this.em_code3.Size = new System.Drawing.Size(231, 26);
             this.em_code3.TabIndex = 258;
             this.em_code3.TableName = null;
             this.em_code3.Tag = "em_code";
@@ -203,11 +215,11 @@
             this.em_name3.AllPower = null;
             this.em_name3.BackColor = System.Drawing.Color.White;
             this.em_name3.ID = null;
-            this.em_name3.Location = new System.Drawing.Point(115, 108);
-            this.em_name3.Margin = new System.Windows.Forms.Padding(2);
+            this.em_name3.Location = new System.Drawing.Point(153, 135);
+            this.em_name3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.em_name3.Name = "em_name3";
             this.em_name3.Power = null;
-            this.em_name3.Size = new System.Drawing.Size(151, 21);
+            this.em_name3.Size = new System.Drawing.Size(200, 25);
             this.em_name3.Str = null;
             this.em_name3.Str1 = null;
             this.em_name3.Str2 = null;
@@ -219,11 +231,11 @@
             this.em_name2.AllPower = null;
             this.em_name2.BackColor = System.Drawing.Color.White;
             this.em_name2.ID = null;
-            this.em_name2.Location = new System.Drawing.Point(579, 104);
-            this.em_name2.Margin = new System.Windows.Forms.Padding(2);
+            this.em_name2.Location = new System.Drawing.Point(772, 130);
+            this.em_name2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.em_name2.Name = "em_name2";
             this.em_name2.Power = null;
-            this.em_name2.Size = new System.Drawing.Size(148, 21);
+            this.em_name2.Size = new System.Drawing.Size(196, 25);
             this.em_name2.Str = null;
             this.em_name2.Str1 = null;
             this.em_name2.Str2 = null;
@@ -238,13 +250,13 @@
             this.ScreenOutGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenOutGroup.Image = null;
             this.ScreenOutGroup.IsShowBorder = true;
-            this.ScreenOutGroup.Location = new System.Drawing.Point(782, 72);
-            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(2);
+            this.ScreenOutGroup.Location = new System.Drawing.Point(1043, 90);
+            this.ScreenOutGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ScreenOutGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.MoveImage")));
             this.ScreenOutGroup.Name = "ScreenOutGroup";
             this.ScreenOutGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenOutGroup.NormalImage")));
             this.ScreenOutGroup.Power = null;
-            this.ScreenOutGroup.Size = new System.Drawing.Size(56, 27);
+            this.ScreenOutGroup.Size = new System.Drawing.Size(75, 34);
             this.ScreenOutGroup.TabIndex = 254;
             this.ScreenOutGroup.Text = "筛选";
             this.ScreenOutGroup.UseVisualStyleBackColor = false;
@@ -258,13 +270,13 @@
             this.ScreenInGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ScreenInGroup.Image = null;
             this.ScreenInGroup.IsShowBorder = true;
-            this.ScreenInGroup.Location = new System.Drawing.Point(319, 70);
-            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(2);
+            this.ScreenInGroup.Location = new System.Drawing.Point(425, 88);
+            this.ScreenInGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ScreenInGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.MoveImage")));
             this.ScreenInGroup.Name = "ScreenInGroup";
             this.ScreenInGroup.NormalImage = ((System.Drawing.Image)(resources.GetObject("ScreenInGroup.NormalImage")));
             this.ScreenInGroup.Power = null;
-            this.ScreenInGroup.Size = new System.Drawing.Size(56, 27);
+            this.ScreenInGroup.Size = new System.Drawing.Size(75, 34);
             this.ScreenInGroup.TabIndex = 253;
             this.ScreenInGroup.Text = "筛选";
             this.ScreenInGroup.UseVisualStyleBackColor = false;
@@ -279,11 +291,11 @@
             this.em_name1,
             this.em_depart,
             this.em_position});
-            this.OutGroupUser.Location = new System.Drawing.Point(478, 158);
-            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(2);
+            this.OutGroupUser.Location = new System.Drawing.Point(637, 198);
+            this.OutGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutGroupUser.Name = "OutGroupUser";
             this.OutGroupUser.RowTemplate.Height = 27;
-            this.OutGroupUser.Size = new System.Drawing.Size(375, 444);
+            this.OutGroupUser.Size = new System.Drawing.Size(500, 555);
             this.OutGroupUser.TabIndex = 243;
             // 
             // em_code1
@@ -319,10 +331,10 @@
             // UserOut
             // 
             this.UserOut.Image = ((System.Drawing.Image)(resources.GetObject("UserOut.Image")));
-            this.UserOut.Location = new System.Drawing.Point(408, 417);
-            this.UserOut.Margin = new System.Windows.Forms.Padding(2);
+            this.UserOut.Location = new System.Drawing.Point(544, 521);
+            this.UserOut.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserOut.Name = "UserOut";
-            this.UserOut.Size = new System.Drawing.Size(56, 24);
+            this.UserOut.Size = new System.Drawing.Size(75, 30);
             this.UserOut.TabIndex = 241;
             this.UserOut.UseVisualStyleBackColor = true;
             this.UserOut.Click += new System.EventHandler(this.UserOut_Click);
@@ -330,10 +342,10 @@
             // UserIn
             // 
             this.UserIn.Image = ((System.Drawing.Image)(resources.GetObject("UserIn.Image")));
-            this.UserIn.Location = new System.Drawing.Point(408, 356);
-            this.UserIn.Margin = new System.Windows.Forms.Padding(2);
+            this.UserIn.Location = new System.Drawing.Point(544, 445);
+            this.UserIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserIn.Name = "UserIn";
-            this.UserIn.Size = new System.Drawing.Size(56, 24);
+            this.UserIn.Size = new System.Drawing.Size(75, 30);
             this.UserIn.TabIndex = 240;
             this.UserIn.UseVisualStyleBackColor = true;
             this.UserIn.Click += new System.EventHandler(this.UserIn_Click);
@@ -348,11 +360,11 @@
             this.em_name,
             this.em_indate,
             this.em_recorder});
-            this.InGroupUser.Location = new System.Drawing.Point(20, 158);
-            this.InGroupUser.Margin = new System.Windows.Forms.Padding(2);
+            this.InGroupUser.Location = new System.Drawing.Point(27, 198);
+            this.InGroupUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.InGroupUser.Name = "InGroupUser";
             this.InGroupUser.RowTemplate.Height = 27;
-            this.InGroupUser.Size = new System.Drawing.Size(375, 444);
+            this.InGroupUser.Size = new System.Drawing.Size(500, 555);
             this.InGroupUser.TabIndex = 239;
             // 
             // em_code
@@ -396,9 +408,9 @@
             // 
             // Employee_ChooseUserToGroup
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(876, 612);
+            this.ClientSize = new System.Drawing.Size(1168, 765);
             this.Controls.Add(this.em_code2);
             this.Controls.Add(this.em_code3);
             this.Controls.Add(this.ug_name_title_label);
@@ -420,6 +432,7 @@
             this.Controls.Add(this.ug_code_title_label);
             this.Controls.Add(this.ug_code_title);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Employee_ChooseUserToGroup";
             this.Tag = "ShowDialogWindow";
             this.Text = "人员选择";

UAS-MES/FunctionCode/Employee/Employee_Group.Designer.cs

@@ -62,7 +62,7 @@
             // 
             this.ug_name_label.AutoSize = true;
             this.ug_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ug_name_label.Location = new System.Drawing.Point(341, 30);
+            this.ug_name_label.Location = new System.Drawing.Point(352, 30);
             this.ug_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ug_name_label.Name = "ug_name_label";
             this.ug_name_label.Size = new System.Drawing.Size(72, 27);
@@ -83,7 +83,7 @@
             this.UserGroupDGV.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.UserGroupDGV.Name = "UserGroupDGV";
             this.UserGroupDGV.RowTemplate.Height = 27;
-            this.UserGroupDGV.Size = new System.Drawing.Size(833, 598);
+            this.UserGroupDGV.Size = new System.Drawing.Size(869, 598);
             this.UserGroupDGV.TabIndex = 244;
             this.UserGroupDGV.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.UserGroupDGV_CellClick);
             // 
@@ -135,7 +135,7 @@
             this.NewGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.NewGroup.Image = null;
             this.NewGroup.IsShowBorder = true;
-            this.NewGroup.Location = new System.Drawing.Point(707, 28);
+            this.NewGroup.Location = new System.Drawing.Point(743, 29);
             this.NewGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.NewGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("NewGroup.MoveImage")));
             this.NewGroup.Name = "NewGroup";
@@ -156,7 +156,7 @@
             this.DeleteGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.DeleteGroup.Image = null;
             this.DeleteGroup.IsShowBorder = true;
-            this.DeleteGroup.Location = new System.Drawing.Point(785, 28);
+            this.DeleteGroup.Location = new System.Drawing.Point(821, 29);
             this.DeleteGroup.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DeleteGroup.MoveImage = ((System.Drawing.Image)(resources.GetObject("DeleteGroup.MoveImage")));
             this.DeleteGroup.Name = "DeleteGroup";
@@ -176,7 +176,7 @@
             this.Screen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Screen.Image = null;
             this.Screen.IsShowBorder = true;
-            this.Screen.Location = new System.Drawing.Point(631, 28);
+            this.Screen.Location = new System.Drawing.Point(667, 29);
             this.Screen.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
@@ -195,7 +195,7 @@
             this.ug_name1.Condition = null;
             this.ug_name1.DBTitle = null;
             this.ug_name1.FormName = null;
-            this.ug_name1.Location = new System.Drawing.Point(432, 30);
+            this.ug_name1.Location = new System.Drawing.Point(443, 30);
             this.ug_name1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ug_name1.Name = "ug_name1";
             this.ug_name1.Power = null;
@@ -230,7 +230,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(915, 695);
+            this.ClientSize = new System.Drawing.Size(959, 695);
             this.Controls.Add(this.UserGroupDGV);
             this.Controls.Add(this.NewGroup);
             this.Controls.Add(this.DeleteGroup);
@@ -240,7 +240,7 @@
             this.Controls.Add(this.ug_code1);
             this.Controls.Add(this.ug_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Employee_Group";
             this.Tag = "Employee!Data";
             this.Text = "人员资料";

UAS-MES/FunctionCode/Employee/Employee_Power.Designer.cs

@@ -120,17 +120,17 @@
             // 
             // SavePower
             // 
-            this.SavePower.AllPower = "ifall";
+            this.SavePower.AllPower = "";
             this.SavePower.BackColor = System.Drawing.Color.Transparent;
             this.SavePower.DownImage = ((System.Drawing.Image)(resources.GetObject("SavePower.DownImage")));
             this.SavePower.Image = ((System.Drawing.Image)(resources.GetObject("SavePower.Image")));
             this.SavePower.IsShowBorder = true;
-            this.SavePower.Location = new System.Drawing.Point(535, 598);
+            this.SavePower.Location = new System.Drawing.Point(537, 571);
             this.SavePower.Margin = new System.Windows.Forms.Padding(4);
             this.SavePower.MoveImage = ((System.Drawing.Image)(resources.GetObject("SavePower.MoveImage")));
             this.SavePower.Name = "SavePower";
             this.SavePower.NormalImage = ((System.Drawing.Image)(resources.GetObject("SavePower.NormalImage")));
-            this.SavePower.Power = "ifwrite";
+            this.SavePower.Power = "";
             this.SavePower.Size = new System.Drawing.Size(80, 30);
             this.SavePower.TabIndex = 1;
             this.SavePower.Tag = "";
@@ -149,7 +149,7 @@
             this.ugp_id,
             this.Column1,
             this.Column2});
-            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 88);
+            this.GroupPowerDGV.Location = new System.Drawing.Point(4, 63);
             this.GroupPowerDGV.Margin = new System.Windows.Forms.Padding(4);
             this.GroupPowerDGV.Name = "GroupPowerDGV";
             this.GroupPowerDGV.RowTemplate.Height = 23;
@@ -198,7 +198,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1149, 635);
+            this.ClientSize = new System.Drawing.Size(1149, 619);
             this.Controls.Add(this.sn_module);
             this.Controls.Add(this.ug_code);
             this.Controls.Add(this.Screen);

UAS-MES/FunctionCode/Employee/Employee_Power.cs

@@ -48,7 +48,8 @@ namespace UAS_MES.Employee
             //不检测进程
             CheckForIllegalCrossThreadCalls = false;
             //界面加载时设置保存按钮不可见
-            SavePower.Visible = false;
+            if (ug_code.Text == "")
+                SavePower.Visible = false;
             dh = new DataHelper();
             ///手动插入四列含有列头勾选框的列
             for (int i = 0; i < title.Length; i++)
@@ -99,8 +100,15 @@ namespace UAS_MES.Employee
             //保存表格中变更的记录
             dt = (DataTable)GroupPowerDGV.DataSource;
             //删除之前的分组权限
-            dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "'", "delete");
-            string insertsql = "Insert into cs$usergrouppower (ugp_id,ugp_groupcode,ugp_caller,ugp_ifread,ugp_ifwrite,ugp_ifdelete,ugp_ifspecial,ugp_ifall) values(cs$usergrouppower_seq.nextval,'" + ug_code.Text + "',:ugp_caller,:ugp_ifread,:ugp_ifwrite,:ugp_ifdelete,:ugp_ifspecial,:ugp_ifall)";
+            if (sn_module.Text == "" || sn_module.Text == "全部")
+            {
+                dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "'", "delete");
+            }
+            else
+            {
+                dh.ExecuteSql("delete from cs$usergrouppower where ugp_groupcode='" + ug_code.Text + "' and ugp_module='" + sn_module.Text + "'", "delete");
+            }
+            string insertsql = "Insert into cs$usergrouppower (ugp_id,ugp_module,ugp_groupcode,ugp_caller,ugp_ifread,ugp_ifwrite,ugp_ifdelete,ugp_ifspecial,ugp_ifall) values(cs$usergrouppower_seq.nextval,'"+sn_module.Text+"','" + ug_code.Text + "',:ugp_caller,:ugp_ifread,:ugp_ifwrite,:ugp_ifdelete,:ugp_ifspecial,:ugp_ifall)";
             //获取变化了得DataSource
             DataTable ChangedDT = dt.GetChanges();
             if (ChangedDT != null)

UAS-MES/FunctionCode/Employee/Employee_Power.resx

@@ -395,4 +395,19 @@
   <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Em_GroupCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Sn_ClassName1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ugp_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.Designer.cs

@@ -102,7 +102,7 @@
             this.Column2,
             this.Column3});
             this.PowerSearchDGV.Location = new System.Drawing.Point(0, 89);
-            this.PowerSearchDGV.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PowerSearchDGV.Margin = new System.Windows.Forms.Padding(4);
             this.PowerSearchDGV.Name = "PowerSearchDGV";
             this.PowerSearchDGV.ReadOnly = true;
             this.PowerSearchDGV.RowTemplate.Height = 23;
@@ -197,7 +197,7 @@
             // 
             // Screen
             // 
-            this.Screen.AllPower = "ifall";
+            this.Screen.AllPower = "";
             this.Screen.BackColor = System.Drawing.Color.Transparent;
             this.Screen.DownImage = ((System.Drawing.Image)(resources.GetObject("Screen.DownImage")));
             this.Screen.Image = null;
@@ -207,7 +207,7 @@
             this.Screen.MoveImage = ((System.Drawing.Image)(resources.GetObject("Screen.MoveImage")));
             this.Screen.Name = "Screen";
             this.Screen.NormalImage = ((System.Drawing.Image)(resources.GetObject("Screen.NormalImage")));
-            this.Screen.Power = "ifread";
+            this.Screen.Power = "";
             this.Screen.Size = new System.Drawing.Size(75, 28);
             this.Screen.TabIndex = 219;
             this.Screen.Text = "筛选";

UAS-MES/FunctionCode/Employee/Employee_PowerSarch.resx

@@ -150,39 +150,6 @@
   <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ug_group.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ugp_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="sn_displayname.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Em_GroupCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ugp_ifread.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ugp_ifwrite.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ugp_ifdelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ugp_ifspecial.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Screen.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>