员工档案 添加启用功能 查询可区分有效标识

DK.Basics/BaseResources/Messages.Designer.cs

@@ -460,7 +460,16 @@ namespace Dongke.IBOSS.PRD.Basics.BaseResources {
                 return ResourceManager.GetString("MSG_HR_W001", resourceCulture);
             }
         }
-        
+        /// <summary>
+        ///   查找类似 此状态的员工不能启用。 的本地化字符串。
+        /// </summary>
+        public static string MSG_HR_W0001
+        {
+            get
+            {
+                return ResourceManager.GetString("MSG_HR_W0001", resourceCulture);
+            }
+        }
         /// <summary>
         ///   查找类似 此状态的员工履历不能停用。 的本地化字符串。
         /// </summary>

DK.Client/HRModule/F_HR_0101.Designer.cs

@@ -48,18 +48,6 @@
 			this.lblStaffCode = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.lblStaffName = new Dongke.IBOSS.PRD.Basics.BaseControls.C_Label();
 			this.dgvStaff = new Dongke.IBOSS.PRD.Basics.BaseControls.C_DataGridView();
-			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
-			this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnDisable = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnUpdate = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnDown = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnMoreCondition = new System.Windows.Forms.ToolStripButton();
-			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
-			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
-			this.sfDialogTemplet = new System.Windows.Forms.SaveFileDialog();
-			this.oFileDialog = new System.Windows.Forms.OpenFileDialog();
 			this.Organizationname = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.StaffID = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.StaffCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -90,6 +78,20 @@
 			this.AccountNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.Remarks = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.OrganizationID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.tsrOperate = new Dongke.IBOSS.PRD.Basics.BaseControls.C_ToolStrip();
+			this.tsbtnAdd = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnEdit = new System.Windows.Forms.ToolStripButton();
+			this.enableButton = new System.Windows.Forms.ToolStripLabel();
+			this.tsbtnDisable = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnUpdate = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnDown = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnMoreCondition = new System.Windows.Forms.ToolStripButton();
+			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+			this.tsbtnAdaptive = new System.Windows.Forms.ToolStripButton();
+			this.tsbtnClose = new System.Windows.Forms.ToolStripButton();
+			this.sfDialogTemplet = new System.Windows.Forms.SaveFileDialog();
+			this.oFileDialog = new System.Windows.Forms.OpenFileDialog();
+			this.chkValueFlag = new Dongke.IBOSS.PRD.Basics.BaseControls.C_StatusCheckBox(true,false);
 			this.gbxCondition.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dgvStaff)).BeginInit();
 			this.tsrOperate.SuspendLayout();
@@ -107,6 +109,7 @@
             | System.Windows.Forms.AnchorStyles.Right)));
 			this.gbxCondition.BackColor = System.Drawing.Color.Transparent;
 			this.gbxCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("gbxCondition.BackgroundImage")));
+			this.gbxCondition.Controls.Add(this.chkValueFlag);
 			this.gbxCondition.Controls.Add(this.txtStaffCode);
 			this.gbxCondition.Controls.Add(this.SelStaffStatus);
 			this.gbxCondition.Controls.Add(this.txtOther);
@@ -122,7 +125,7 @@
 			this.gbxCondition.Location = new System.Drawing.Point(0, 38);
 			this.gbxCondition.Name = "gbxCondition";
 			this.gbxCondition.OriginalHeight = -1;
-			this.gbxCondition.Size = new System.Drawing.Size(989, 119);
+			this.gbxCondition.Size = new System.Drawing.Size(1098, 119);
 			this.gbxCondition.TabIndex = 0;
 			this.gbxCondition.TabStop = false;
 			this.gbxCondition.Text = "查询条件 ▼";
@@ -151,7 +154,7 @@
 			this.SelStaffStatus.DisplayMember = "StaffStatusName";
 			this.SelStaffStatus.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.SelStaffStatus.LablePositionValue = Dongke.IBOSS.PRD.Basics.BaseControls.CheckedBoxListEx.LablePosition.Left;
-			this.SelStaffStatus.Location = new System.Drawing.Point(553, 19);
+			this.SelStaffStatus.Location = new System.Drawing.Point(697, 18);
 			this.SelStaffStatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
 			this.SelStaffStatus.Name = "SelStaffStatus";
 			this.SelStaffStatus.SelectedIndex = -1;
@@ -183,7 +186,7 @@
 			this.btnClearCondition.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnClearCondition.BackgroundImage")));
 			this.btnClearCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnClearCondition.ForeColor = System.Drawing.Color.White;
-			this.btnClearCondition.Location = new System.Drawing.Point(899, 83);
+			this.btnClearCondition.Location = new System.Drawing.Point(1008, 83);
 			this.btnClearCondition.Name = "btnClearCondition";
 			this.btnClearCondition.Size = new System.Drawing.Size(85, 30);
 			this.btnClearCondition.TabIndex = 8;
@@ -210,7 +213,7 @@
 			this.btnSearch.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSearch.BackgroundImage")));
 			this.btnSearch.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 			this.btnSearch.ForeColor = System.Drawing.Color.White;
-			this.btnSearch.Location = new System.Drawing.Point(808, 83);
+			this.btnSearch.Location = new System.Drawing.Point(917, 83);
 			this.btnSearch.Name = "btnSearch";
 			this.btnSearch.Size = new System.Drawing.Size(85, 30);
 			this.btnSearch.TabIndex = 7;
@@ -358,7 +361,7 @@
 			this.dgvStaff.RowsDefaultCellStyle = dataGridViewCellStyle5;
 			this.dgvStaff.RowTemplate.Height = 21;
 			this.dgvStaff.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dgvStaff.Size = new System.Drawing.Size(989, 456);
+			this.dgvStaff.Size = new System.Drawing.Size(1098, 456);
 			this.dgvStaff.SortOrderColumnName = null;
 			this.dgvStaff.TabIndex = 13;
 			this.dgvStaff.Tag = true;
@@ -367,129 +370,6 @@
 			this.dgvStaff.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStaff_CellEnter);
 			this.dgvStaff.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvStaff_CellMouseDoubleClick);
 			// 
-			// tsrOperate
-			// 
-			this.tsrOperate.AutoSize = false;
-			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
-			this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.HRModule.Properties.Resources.functionbackground;
-			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.tsbtnAdd,
-            this.tsbtnEdit,
-            this.tsbtnDisable,
-            this.tsbtnUpdate,
-            this.tsbtnDown,
-            this.tsbtnMoreCondition,
-            this.toolStripSeparator1,
-            this.tsbtnAdaptive,
-            this.tsbtnClose});
-			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
-			this.tsrOperate.Name = "tsrOperate";
-			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-			this.tsrOperate.ShowItemToolTips = false;
-			this.tsrOperate.Size = new System.Drawing.Size(1001, 35);
-			this.tsrOperate.TabIndex = 23;
-			this.tsrOperate.Text = "toolStrip1";
-			// 
-			// tsbtnAdd
-			// 
-			this.tsbtnAdd.AutoSize = false;
-			this.tsbtnAdd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnAdd.Name = "tsbtnAdd";
-			this.tsbtnAdd.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnAdd.Text = "新建(&N)";
-			this.tsbtnAdd.Click += new System.EventHandler(this.tsbtnAdd_Click);
-			// 
-			// tsbtnEdit
-			// 
-			this.tsbtnEdit.AutoSize = false;
-			this.tsbtnEdit.Enabled = false;
-			this.tsbtnEdit.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnEdit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnEdit.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnEdit.Name = "tsbtnEdit";
-			this.tsbtnEdit.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnEdit.Text = "编辑(&E)";
-			this.tsbtnEdit.Click += new System.EventHandler(this.tsbtnEdit_Click);
-			// 
-			// tsbtnDisable
-			// 
-			this.tsbtnDisable.AutoSize = false;
-			this.tsbtnDisable.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnDisable.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnDisable.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnDisable.Name = "tsbtnDisable";
-			this.tsbtnDisable.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnDisable.Text = "停用(&S)";
-			this.tsbtnDisable.Click += new System.EventHandler(this.tsbtnDisable_Click);
-			// 
-			// tsbtnUpdate
-			// 
-			this.tsbtnUpdate.AutoSize = false;
-			this.tsbtnUpdate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnUpdate.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnUpdate.Name = "tsbtnUpdate";
-			this.tsbtnUpdate.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnUpdate.Text = "导入(&I)";
-			this.tsbtnUpdate.Click += new System.EventHandler(this.tsbtnUpdate_Click);
-			// 
-			// tsbtnDown
-			// 
-			this.tsbtnDown.AutoSize = false;
-			this.tsbtnDown.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnDown.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnDown.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnDown.Name = "tsbtnDown";
-			this.tsbtnDown.Size = new System.Drawing.Size(80, 25);
-			this.tsbtnDown.Text = "下载模板(&D)";
-			this.tsbtnDown.Click += new System.EventHandler(this.tsbtnDown_Click);
-			// 
-			// tsbtnMoreCondition
-			// 
-			this.tsbtnMoreCondition.AutoSize = false;
-			this.tsbtnMoreCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnMoreCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnMoreCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnMoreCondition.Name = "tsbtnMoreCondition";
-			this.tsbtnMoreCondition.Size = new System.Drawing.Size(80, 25);
-			this.tsbtnMoreCondition.Text = "更多条件(&M)";
-			this.tsbtnMoreCondition.Click += new System.EventHandler(this.tsbtnMoreCondition_Click);
-			// 
-			// toolStripSeparator1
-			// 
-			this.toolStripSeparator1.AutoSize = false;
-			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
-			// 
-			// tsbtnAdaptive
-			// 
-			this.tsbtnAdaptive.AutoSize = false;
-			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
-			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
-			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
-			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
-			// 
-			// tsbtnClose
-			// 
-			this.tsbtnClose.AutoSize = false;
-			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
-			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
-			this.tsbtnClose.Name = "tsbtnClose";
-			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
-			this.tsbtnClose.Text = "关闭(&X)";
-			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
-			// 
-			// oFileDialog
-			// 
-			this.oFileDialog.FileName = "openFileDialog1";
-			// 
 			// Organizationname
 			// 
 			this.Organizationname.DataPropertyName = "Organizationname";
@@ -702,11 +582,157 @@
 			this.OrganizationID.ReadOnly = true;
 			this.OrganizationID.Visible = false;
 			// 
+			// tsrOperate
+			// 
+			this.tsrOperate.AutoSize = false;
+			this.tsrOperate.BackColor = System.Drawing.Color.Transparent;
+			this.tsrOperate.BackgroundImage = global::Dongke.IBOSS.PRD.Client.HRModule.Properties.Resources.functionbackground;
+			this.tsrOperate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsrOperate.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.tsbtnAdd,
+            this.tsbtnEdit,
+            this.enableButton,
+            this.tsbtnDisable,
+            this.tsbtnUpdate,
+            this.tsbtnDown,
+            this.tsbtnMoreCondition,
+            this.toolStripSeparator1,
+            this.tsbtnAdaptive,
+            this.tsbtnClose});
+			this.tsrOperate.Location = new System.Drawing.Point(0, 0);
+			this.tsrOperate.Name = "tsrOperate";
+			this.tsrOperate.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
+			this.tsrOperate.ShowItemToolTips = false;
+			this.tsrOperate.Size = new System.Drawing.Size(1110, 35);
+			this.tsrOperate.TabIndex = 23;
+			this.tsrOperate.Text = "toolStrip1";
+			// 
+			// tsbtnAdd
+			// 
+			this.tsbtnAdd.AutoSize = false;
+			this.tsbtnAdd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdd.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdd.Name = "tsbtnAdd";
+			this.tsbtnAdd.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnAdd.Text = "新建(&N)";
+			this.tsbtnAdd.Click += new System.EventHandler(this.tsbtnAdd_Click);
+			// 
+			// tsbtnEdit
+			// 
+			this.tsbtnEdit.AutoSize = false;
+			this.tsbtnEdit.Enabled = false;
+			this.tsbtnEdit.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnEdit.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnEdit.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnEdit.Name = "tsbtnEdit";
+			this.tsbtnEdit.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnEdit.Text = "编辑(&E)";
+			this.tsbtnEdit.Click += new System.EventHandler(this.tsbtnEdit_Click);
+			// 
+			// enableButton
+			// 
+			this.enableButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+			this.enableButton.Name = "enableButton";
+			this.enableButton.Size = new System.Drawing.Size(29, 32);
+			this.enableButton.Text = "启用";
+			this.enableButton.Click += new System.EventHandler(this.enableButton_Click);
+			// 
+			// tsbtnDisable
+			// 
+			this.tsbtnDisable.AutoSize = false;
+			this.tsbtnDisable.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnDisable.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnDisable.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnDisable.Name = "tsbtnDisable";
+			this.tsbtnDisable.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnDisable.Text = "停用(&S)";
+			this.tsbtnDisable.Click += new System.EventHandler(this.tsbtnDisable_Click);
+			// 
+			// tsbtnUpdate
+			// 
+			this.tsbtnUpdate.AutoSize = false;
+			this.tsbtnUpdate.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnUpdate.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnUpdate.Name = "tsbtnUpdate";
+			this.tsbtnUpdate.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnUpdate.Text = "导入(&I)";
+			this.tsbtnUpdate.Click += new System.EventHandler(this.tsbtnUpdate_Click);
+			// 
+			// tsbtnDown
+			// 
+			this.tsbtnDown.AutoSize = false;
+			this.tsbtnDown.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnDown.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnDown.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnDown.Name = "tsbtnDown";
+			this.tsbtnDown.Size = new System.Drawing.Size(80, 25);
+			this.tsbtnDown.Text = "下载模板(&D)";
+			this.tsbtnDown.Click += new System.EventHandler(this.tsbtnDown_Click);
+			// 
+			// tsbtnMoreCondition
+			// 
+			this.tsbtnMoreCondition.AutoSize = false;
+			this.tsbtnMoreCondition.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnMoreCondition.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnMoreCondition.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnMoreCondition.Name = "tsbtnMoreCondition";
+			this.tsbtnMoreCondition.Size = new System.Drawing.Size(80, 25);
+			this.tsbtnMoreCondition.Text = "更多条件(&M)";
+			this.tsbtnMoreCondition.Click += new System.EventHandler(this.tsbtnMoreCondition_Click);
+			// 
+			// toolStripSeparator1
+			// 
+			this.toolStripSeparator1.AutoSize = false;
+			this.toolStripSeparator1.Name = "toolStripSeparator1";
+			this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25);
+			// 
+			// tsbtnAdaptive
+			// 
+			this.tsbtnAdaptive.AutoSize = false;
+			this.tsbtnAdaptive.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnAdaptive.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnAdaptive.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnAdaptive.Name = "tsbtnAdaptive";
+			this.tsbtnAdaptive.Size = new System.Drawing.Size(90, 25);
+			this.tsbtnAdaptive.Text = "自适应列宽(&A)";
+			this.tsbtnAdaptive.Click += new System.EventHandler(this.tsbtnAdaptive_Click);
+			// 
+			// tsbtnClose
+			// 
+			this.tsbtnClose.AutoSize = false;
+			this.tsbtnClose.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.tsbtnClose.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+			this.tsbtnClose.ImageTransparentColor = System.Drawing.Color.Magenta;
+			this.tsbtnClose.Name = "tsbtnClose";
+			this.tsbtnClose.Size = new System.Drawing.Size(60, 25);
+			this.tsbtnClose.Text = "关闭(&X)";
+			this.tsbtnClose.Click += new System.EventHandler(this.tsbtnClose_Click);
+			// 
+			// oFileDialog
+			// 
+			this.oFileDialog.FileName = "openFileDialog1";
+			// 
+			// chkValueFlag
+			// 
+			this.chkValueFlag.BackColor = System.Drawing.SystemColors.Control;
+			this.chkValueFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkValueFlag.BackgroundImage")));
+			this.chkValueFlag.FalseText = "否";
+			this.chkValueFlag.Location = new System.Drawing.Point(555, 19);
+			this.chkValueFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+			this.chkValueFlag.Name = "chkValueFlag";
+			this.chkValueFlag.Size = new System.Drawing.Size(136, 20);
+			this.chkValueFlag.TabIndex = 24;
+			this.chkValueFlag.Title = "有效";
+			this.chkValueFlag.TitleAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.chkValueFlag.TrueText = "是";
+			// 
 			// F_HR_0101
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1001, 618);
+			this.ClientSize = new System.Drawing.Size(1110, 618);
 			this.Controls.Add(this.tsrOperate);
 			this.Controls.Add(this.gbxCondition);
 			this.Controls.Add(this.dgvStaff);
@@ -786,6 +812,8 @@
 		private System.Windows.Forms.DataGridViewTextBoxColumn AccountNo;
 		private System.Windows.Forms.DataGridViewTextBoxColumn Remarks;
 		private System.Windows.Forms.DataGridViewTextBoxColumn OrganizationID;
+		private System.Windows.Forms.ToolStripLabel enableButton;
+		private Basics.BaseControls.C_StatusCheckBox chkValueFlag;
 		//private Controls.dkOrganizationSearchBox sbxOrganization;
 		//private Basics.BaseControls.C_ValidCheckedBoxList c_ValidCheckedBoxList1;
 

DK.Client/HRModule/F_HR_0101.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Windows.Forms;
+using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DockPanel;
 using Dongke.IBOSS.PRD.Basics.Library;
@@ -398,6 +399,35 @@ namespace Dongke.IBOSS.PRD.Client.HRModule
 				throw ex;
 			}
 		}
+		/// <summary>
+		/// 设置启用
+		/// </summary>
+		/// <param name="staffid"></param>
+		/// <returns></returns>
+		private void EnableValueFlag()
+		{
+			ClientRequestEntity cre = new ClientRequestEntity();
+			cre.NameSpace = "F_HR_0101";
+			cre.Name = "STAFF";
+			cre.Properties["Staffid"] = this._staffID;
+			ServiceResultEntity sre = SystemModuleProxy.Service.DoRequest(cre);
+			if (sre.OtherStatus > 0)
+			{
+				DKMessageBox.ShowDialog(this, DKMessageCode.I_CMN_S_002);
+				return;
+			}
+			else if (Convert.ToInt32(sre.OtherStatus) == -1001)
+			{
+				MessageBox.Show(string.Format(Messages.MSG_HR_W0001,
+							""),
+							"",
+							MessageBoxButtons.OK,
+							MessageBoxIcon.Warning);
+				return;
+			}
+		}
+
+
 
 		private void tsbtnDown_Click(object sender, EventArgs e)
 		{
@@ -544,7 +574,22 @@ namespace Dongke.IBOSS.PRD.Client.HRModule
 				DataConvert.Convert(_staffEntity, pSearchStaff);
 				pSearchStaff.StaffCode = this.txtStaffCode.Text.Trim();
 				pSearchStaff.StaffName = this.txtStaffName.Text.Trim();
-				pSearchStaff.ValueFlag = true;
+				object[] objListValue = chkValueFlag.SelectedValues;
+				if (objListValue.Length>=2 || objListValue.Length<1)
+				{
+					pSearchStaff.ValueFlag = null;
+				}
+				if (objListValue.Length == 1) {
+
+					if (objListValue[0].ToString() == "1") {
+						pSearchStaff.ValueFlag = true;
+					}
+					if (objListValue[0].ToString() == "0")
+					{
+						pSearchStaff.ValueFlag = false;
+					}
+				}
+				
 				pSearchStaff.StaffStatusArray = SelStaffStatus.SelectedArray;
 			}
 			try
@@ -1097,5 +1142,27 @@ namespace Dongke.IBOSS.PRD.Client.HRModule
 			}
 		}
 		#endregion
+
+		private void enableButton_Click(object sender, EventArgs e)
+		{
+			try
+			{
+				DialogResult msgBoxResult = MessageBox.Show(
+					string.Format(Messages.MSG_CMN_Q002, "该员工", "启用"), this.Text,
+					MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+				if (msgBoxResult == DialogResult.Yes)
+				{
+					int staffid = Convert.ToInt32(this.dgvStaff.CurrentRow.Cells["staffID"].Value);
+					this._staffID = staffid;
+					EnableValueFlag();
+				}
+			}
+			catch (Exception ex)
+			{
+				// 对异常进行共通处理
+				ExceptionManager.HandleEventException(this.ToString(),
+					System.Reflection.MethodBase.GetCurrentMethod().Name, this.Text, ex);
+			}
+		}
 	}
 }

DK.Client/HRModule/F_HR_0101.resx

@@ -178,6 +178,63 @@
         TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
 </value>
   </data>
+  <data name="chkValueFlag.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+        DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
+        bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
+        iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
+        sf0ABniAAaYAMFnpqb5B7sFAJC83F3q6yAn8i94MAUj8vmXo6U+ng/9P0qxUvgAAyF/E5mxOOkvE+SJO
+        yhSkiu0zIqbGJIoZRomZL0pQxHJijlvkpZ99FtlRzOxkHlvE4pxT2clsMfeIeHuGkCNixEfEBRlcTqaI
+        b4tYM0mYzBXxW3FsMoeZDgCKJLYLOKx4EZuImMQPDnQR8XIAcKS4LzjmCxZwsgTiQ7mkpGbzuXHxArou
+        S49uam3NoHtyMpM4AoGhP5OVyOSz6S4pyalMXjYAi2f+LBlxbemiIluaWltaGpoZmX5RqP+6+Dcl7u0i
+        vQr43DOI1veH7a/8UuoAYMyKarPrD1vMfgA6tgIgd/8Pm+YhACRFfWu/8cV5aOJ5iRcIUm2MjTMzM424
+        HJaRuKC/6386/A198T0j8Xa/l4fuyollCpMEdHHdWClJKUI+PT2VyeLQDf88xP848K/zWBrIieXwOTxR
+        RKhoyri8OFG7eWyugJvCo3N5/6mJ/zDsT1qca5Eo9Z8ANcoISN2gAuTnPoCiEAESeVDc9d/75oMPBeKb
+        F6Y6sTj3nwX9+65wifiRzo37HOcSGExnCfkZi2viawnQgAAkARXIAxWgAXSBITADVsAWOAI3sAL4gWAQ
+        DtYCFogHyYAPMkEu2AwKQBHYBfaCSlAD6kEjaAEnQAc4DS6Ay+A6uAnugAdgBIyD52AGvAHzEARhITJE
+        geQhVUgLMoDMIAZkD7lBPlAgFA5FQ3EQDxJCudAWqAgqhSqhWqgR+hY6BV2ArkID0D1oFJqCfoXewwhM
+        gqmwMqwNG8MM2An2hoPhNXAcnAbnwPnwTrgCroOPwe3wBfg6fAcegZ/DswhAiAgNUUMMEQbigvghEUgs
+        wkc2IIVIOVKHtCBdSC9yCxlBppF3KAyKgqKjDFG2KE9UCIqFSkNtQBWjKlFHUe2oHtQt1ChqBvUJTUYr
+        oQ3QNmgv9Cp0HDoTXYAuRzeg29CX0HfQ4+g3GAyGhtHBWGE8MeGYBMw6TDHmAKYVcx4zgBnDzGKxWHms
+        AdYO64dlYgXYAux+7DHsOewgdhz7FkfEqeLMcO64CBwPl4crxzXhzuIGcRO4ebwUXgtvg/fDs/HZ+BJ8
+        Pb4LfwM/jp8nSBN0CHaEYEICYTOhgtBCuER4SHhFJBLVidbEACKXuIlYQTxOvEIcJb4jyZD0SS6kSJKQ
+        tJN0hHSedI/0ikwma5MdyRFkAXknuZF8kfyY/FaCImEk4SXBltgoUSXRLjEo8UISL6kl6SS5VjJHslzy
+        pOQNyWkpvJS2lIsUU2qDVJXUKalhqVlpirSptJ90snSxdJP0VelJGayMtoybDFsmX+awzEWZMQpC0aC4
+        UFiULZR6yiXKOBVD1aF6UROoRdRvqP3UGVkZ2WWyobJZslWyZ2RHaAhNm+ZFS6KV0E7QhmjvlygvcVrC
+        WbJjScuSwSVzcopyjnIcuUK5Vrk7cu/l6fJu8onyu+U75B8poBT0FQIUMhUOKlxSmFakKtoqshQLFU8o
+        3leClfSVApXWKR1W6lOaVVZR9lBOVd6vfFF5WoWm4qiSoFKmclZlSpWiaq/KVS1TPaf6jC5Ld6In0Svo
+        PfQZNSU1TzWhWq1av9q8uo56iHqeeqv6Iw2CBkMjVqNMo1tjRlNV01czV7NZ874WXouhFa+1T6tXa05b
+        RztMe5t2h/akjpyOl06OTrPOQ12yroNumm6d7m09jB5DL1HvgN5NfVjfQj9ev0r/hgFsYGnANThgMLAU
+        vdR6KW9p3dJhQ5Khk2GGYbPhqBHNyMcoz6jD6IWxpnGE8W7jXuNPJhYmSSb1Jg9MZUxXmOaZdpn+aqZv
+        xjKrMrttTjZ3N99o3mn+cpnBMs6yg8vuWlAsfC22WXRbfLS0suRbtlhOWWlaRVtVWw0zqAx/RjHjijXa
+        2tl6o/Vp63c2ljYCmxM2v9ga2ibaNtlOLtdZzllev3zMTt2OaVdrN2JPt4+2P2Q/4qDmwHSoc3jiqOHI
+        dmxwnHDSc0pwOub0wtnEme/c5jznYuOy3uW8K+Lq4Vro2u8m4xbiVun22F3dPc692X3Gw8Jjncd5T7Sn
+        t+duz2EvZS+WV6PXzAqrFetX9HiTvIO8K72f+Oj78H26fGHfFb57fB+u1FrJW9nhB/y8/Pb4PfLX8U/z
+        /z4AE+AfUBXwNNA0MDewN4gSFBXUFPQm2Dm4JPhBiG6IMKQ7VDI0MrQxdC7MNaw0bGSV8ar1q66HK4Rz
+        wzsjsBGhEQ0Rs6vdVu9dPR5pEVkQObRGZ03WmqtrFdYmrT0TJRnFjDoZjY4Oi26K/sD0Y9YxZ2O8Yqpj
+        ZlgurH2s52xHdhl7imPHKeVMxNrFlsZOxtnF7YmbineIL4+f5rpwK7kvEzwTahLmEv0SjyQuJIUltSbj
+        kqOTT/FkeIm8nhSVlKyUgVSD1ILUkTSbtL1pM3xvfkM6lL4mvVNAFf1M9Ql1hVuFoxn2GVUZbzNDM09m
+        SWfxsvqy9bN3ZE/kuOd8vQ61jrWuO1ctd3Pu6Hqn9bUboA0xG7o3amzM3zi+yWPT0c2EzYmbf8gzySvN
+        e70lbEtXvnL+pvyxrR5bmwskCvgFw9tst9VsR23nbu/fYb5j/45PhezCa0UmReVFH4pZxde+Mv2q4quF
+        nbE7+0ssSw7uwuzi7Rra7bD7aKl0aU7p2B7fPe1l9LLCstd7o/ZeLV9WXrOPsE+4b6TCp6Jzv+b+Xfs/
+        VMZX3qlyrmqtVqreUT13gH1g8KDjwZYa5ZqimveHuIfu1nrUttdp15UfxhzOOPy0PrS+92vG140NCg1F
+        DR+P8I6MHA082tNo1djYpNRU0gw3C5unjkUeu/mN6zedLYYtta201qLj4Ljw+LNvo78dOuF9ovsk42TL
+        d1rfVbdR2grbofbs9pmO+I6RzvDOgVMrTnV32Xa1fW/0/ZHTaqerzsieKTlLOJt/duFczrnZ86nnpy/E
+        XRjrjup+cHHVxds9AT39l7wvXbnsfvlir1PvuSt2V05ftbl66hrjWsd1y+vtfRZ9bT9Y/NDWb9nffsPq
+        RudN65tdA8sHzg46DF645Xrr8m2v29fvrLwzMBQydHc4cnjkLvvu5L2key/vZ9yff7DpIfph4SOpR+WP
+        lR7X/aj3Y+uI5ciZUdfRvidBTx6Mscae/5T+04fx/Kfkp+UTqhONk2aTp6fcp24+W/1s/Hnq8/npgp+l
+        f65+ofviu18cf+mbWTUz/pL/cuHX4lfyr468Xva6e9Z/9vGb5Dfzc4Vv5d8efcd41/s+7P3EfOYH7IeK
+        j3ofuz55f3q4kLyw8Bv3hPP74uYdwgAAAAlwSFlzAAALDAAACwwBP0AiyAAAAXlJREFUeF7t2EENADAM
+        A7Hyp7pJK4TxONkY8jhlDoTMhZB5EDILIRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMi
+        OUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqa
+        FIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUP
+        TYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5oUjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoU
+        yUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykGTYrkIMUPTYofmhQNTYqGJsWgSZEcpBg0KZKDFD80KX5o
+        UjQ0KRqaFIMmRXKQYtCkSA5S/NCk+KFJ0dCkaGhSDJoUyUGKQZMiOUjxQ5PihyZFQ5OioUkxaFIkBykG
+        TcjuBwk6Lpiwp2VcAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="SelStaffStatus.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAPAAAAB4CAIAAABD1OhwAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH

DK.Service/SystemModuleLogic/SystemModuleLogicPartial.cs

@@ -2647,8 +2647,6 @@ GOODSNAME,
 		}
 		#endregion
 
-
-
 		#region 产品釉料
 		public static ServiceResultEntity GetGoodsGlaze(SUserInfo sUserInfo, ClientRequestEntity cre)
 		{
@@ -2860,5 +2858,54 @@ GOODSNAME,
 			}
 		}
 		#endregion
+
+		#region 员工用户操作
+		public static ServiceResultEntity EnableValueFlag( SUserInfo sUserInfo, ClientRequestEntity cre)
+		{
+			ServiceResultEntity resultEnity = new ServiceResultEntity();
+			IDBTransaction oracleTrConn = ClsDbFactory.CreateDBTransaction(DataBaseType.ORACLE, DataManager.ConnectionString);
+			try
+			{
+				oracleTrConn.Connect();
+				int staffid = (int)cre.Properties["Staffid"];
+				string sql = "SELECT Count(*) FROM TP_HR_STAFF WHERE staffid=" + staffid + "";
+				string strCount = oracleTrConn.GetSqlResultToStr(sql);
+				if (!"0".Equals(strCount))
+				{
+					string sqlString = "Update TP_HR_STAFF SET ValueFlag=1,UpdateUserID =" + sUserInfo.UserID
+							+ " WHERE staffid=" + staffid;
+					oracleTrConn.ExecuteNonQuery(sqlString);
+
+					//string sqlString2 = "Select StaffRecordID From TP_HR_StaffRecord "
+					//        + " Where ApprovalStatus = 0 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
+					//string strStaffRecordID = oracleTrConn.GetSqlResultToStr(sqlString2);
+					//if (!string.IsNullOrEmpty(strStaffRecordID))
+					//{
+					string sqlString3 = "Update TP_HR_StaffRecord Set ValueFlag = 1,UpdateUserID = " + sUserInfo.UserID
+						+ " Where ApprovalStatus = 3 AND RecordType = 1 And ValueFlag = 1 And StaffID = " + staffid;
+					oracleTrConn.ExecuteNonQuery(sqlString3);
+					//}
+					oracleTrConn.Commit();
+					oracleTrConn.Disconnect();
+					return resultEnity;
+				}
+				else
+				{
+					oracleTrConn.Rollback();
+					oracleTrConn.Disconnect();
+					return resultEnity;
+				}
+			}
+			catch (Exception ex)
+			{
+				if (oracleTrConn.ConnState == System.Data.ConnectionState.Open)
+				{
+					oracleTrConn.Rollback();
+					oracleTrConn.Disconnect();
+				}
+				throw ex;
+			}
+		}
+		#endregion
 	}
 }

WCF.Service/WCF.Services/SystemModuleService.cs

@@ -2805,6 +2805,17 @@ namespace Dongke.IBOSS.PRD.WCF.Services
                         return result;
                     }
                 }
+                else if ("F_HR_0101" == cre.NameSpace)
+                {
+                    //查询产品对应釉料
+                    if ("STAFF" == cre.Name)
+                    {
+                        ServiceResultEntity result = ServiceInvoker.Invoke<ServiceResultEntity>(this,
+                           () => SystemModuleLogic.EnableValueFlag(SUserInfo, cre));
+                        return result;
+                    }
+   
+                }
                 else if ("EMPOWERMENTFLAG" == cre.NameSpace)
                 {
                     if ("EMPOWERMENTFLAG" == cre.Name)