20220908 人员列表修改

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx

@@ -145,6 +145,8 @@
                                 </f:TemplateField>
                                 <f:RenderField Hidden="true" Width="1px" HeaderText="培训次数" ColumnID="TrainCount" DataField="TrainCount">
                                 </f:RenderField>
+                                   <f:RenderField Hidden="true" Width="1px" HeaderText="培训次数" ColumnID="TrainCount1" DataField="TrainCount1">
+                                </f:RenderField>
                             </Columns>
                             <Listeners>
                                 <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs

@@ -188,7 +188,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
             }
 
             string strSql = @"SELECT ProjectId,SitePersonId,PersonId,PersonName,IdentityCard,CardNo,PersonName
-                                ,WorkPostId,WorkPostName,UnitId,UnitName,TeamGroupId,TeamGroupName,InTime,RealNameAddTime,States,TrainCount
+                                ,WorkPostId,WorkPostName,UnitId,UnitName,TeamGroupId,TeamGroupName,InTime,RealNameAddTime,States,TrainCount,TrainCount1
                                 FROM View_SitePerson_Person
                                 Where ProjectId=@ProjectId ";
             List<SqlParameter> listStr = new List<SqlParameter>
@@ -263,13 +263,14 @@ namespace FineUIPro.Web.HSSE.SitePerson
             for (int i = 0; i < Grid1.Rows.Count; i++)
             {
                 // string personId = Grid1.Rows[i].DataKeys[0].ToString();
+                var tCount = Grid1.Rows[i].Values[8].ToString();
+                var tCount1 = Grid1.Rows[i].Values[9].ToString();
 
-                var tCount = Grid1.Rows[0].Values[8].ToString();
-                if (tCount == "0") ////未参加过培训的人员
+                if (tCount == "0" && tCount1  == "0") ////未参加过培训的人员
                 {
                     Grid1.Rows[i].RowCssClass = "Red";
                 }
-                var getPerson = Grid1.Rows[0].Values[6].ToString();
+                var getPerson = Grid1.Rows[i].Values[6].ToString();
                 if (getPerson != null)
                 {
                     int j = this.Grid1.Columns.Count - 1;

SGGL/FineUIPro.Web/Person/PersonEdit.aspx

@@ -127,12 +127,13 @@
                                                 </f:DatePicker>
                                             </Items>
                                         </f:FormRow>
-                                        <f:FormRow>
+                                        <f:FormRow ColumnWidths="25% 25% 50%">
                                             <Items>
                                                 <f:RadioButtonList ID="rblSex" runat="server" Label="性别">
                                                     <f:RadioItem Value="1" Text="男" Selected="true" />
                                                     <f:RadioItem Value="2" Text="女" />
                                                 </f:RadioButtonList>
+                                                <f:CheckBox runat="server" ID="ckIsPost" Label="在职" Checked="true" AutoPostBack="true" OnCheckedChanged="ckIsPost_CheckedChanged"></f:CheckBox>
                                                 <f:DatePicker ID="txtBirthday" runat="server" Label="出生日期">
                                                 </f:DatePicker>
                                             </Items>

SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs

@@ -76,6 +76,7 @@ namespace FineUIPro.Web.Person
                         this.txtPersonName.Text = person.PersonName;
                         this.txtJobNum.Text = person.JobNum;
                         this.drpUnit.SelectedValue = person.UnitId;
+                        this.ckIsPost.Checked = person.IsPost.Value;
                         if (!string.IsNullOrEmpty(person.DepartId))
                         {
                             this.drpDepart.SelectedValue = person.DepartId;
@@ -504,7 +505,7 @@ namespace FineUIPro.Web.Person
                 RelativeTel = this.txtRelativeTel.Text.Trim(),
                 Address = this.txtAddress.Text.Trim(),
                 SignatureUrl = this.SignatureUrl,
-                IsPost = true,
+                IsPost = this.ckIsPost.Checked,
             };
 
             newPerson.RoleIds = Funs.GetStringByArray(this.drpRole.SelectedValueArray);
@@ -1049,6 +1050,20 @@ namespace FineUIPro.Web.Person
             }
         }
         #endregion
+
         #endregion
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ckIsPost_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            if (!this.ckIsPost.Checked)
+            {
+                Alert.ShowInParent("人员不在职，则当前人所在的所有项目都将离场！", MessageBoxIcon.Warning);
+            }
+        }
     }
 }

SGGL/FineUIPro.Web/Person/PersonEdit.aspx.designer.cs

@@ -239,6 +239,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblSex;
 
+        /// <summary>
+        /// ckIsPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckIsPost;
+
         /// <summary>
         /// txtBirthday 控件。
         /// </summary>