Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx

@@ -80,6 +80,9 @@
                         FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="出场时间"
                        HeaderTextAlign="Center" TextAlign="Center">
                     </f:RenderField>           
+                      <f:CheckBoxField Width="100px" SortField="IsSynchro" RenderAsStaticField="true" DataField="IsSynchro"
+                            HeaderText="同步实名制" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:CheckBoxField>
                 </Columns>
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/ProjectData/ProjectUnit.aspx.cs

@@ -53,7 +53,9 @@ namespace FineUIPro.Web.ProjectData
         {
             if (this.drpProject.Items.Count() > 0)
             {
-                string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime,ProjectUnit.OutTime "
+                string strSql = @"SELECT ProjectUnit.ProjectUnitId,ProjectUnit.ProjectId,Project.ProjectCode,Project.ProjectName,ProjectUnit.UnitId,Unit.UnitCode
+                        ,Unit.UnitName,ProjectUnit.UnitType,sysConst.ConstText AS UnitTypeName,ProjectUnit.InTime
+                        ,ProjectUnit.OutTime,ProjectUnit.IsSynchro "
                                 + @" FROM Project_ProjectUnit AS ProjectUnit "
                                 + @" LEFT JOIN Base_Project AS Project ON ProjectUnit.ProjectId = Project.ProjectId "
                                 + @" LEFT JOIN Base_Unit AS Unit ON ProjectUnit.UnitId = Unit.UnitId "

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx

@@ -84,7 +84,12 @@
                  <f:TextArea runat="server" ID="txtContractRange" Label="承包范围" Height="60px">
                             </f:TextArea>
                 </Items>
-            </f:FormRow>                 
+            </f:FormRow>      
+                <f:FormRow>
+                <Items>  
+                 <f:CheckBox runat="server" ID="ckIsSynchro" Label="是否同步实名制"></f:CheckBox>
+                </Items>
+            </f:FormRow>
         </rows>
         <toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.cs

@@ -38,6 +38,7 @@ namespace FineUIPro.Web.ProjectData
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();               
                 BLL.ConstValue.InitConstValueDropDownList(this.drpUnitType, ConstValue.Group_ProjectUnitType, true);
                 BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpIdcardType, "ZHENGJIAN_TYPE", true);
+                this.ckIsSynchro.Checked = false;
                 this.ProjectUnitId = Request.QueryString["ProjectUnitId"];
                 if (!String.IsNullOrEmpty(this.ProjectUnitId))
                 {
@@ -85,6 +86,10 @@ namespace FineUIPro.Web.ProjectData
                             this.nbPlanCostB.Text = projectUnit.PlanCostB.ToString();
                         }
                         this.txtContractRange.Text = projectUnit.ContractRange;
+                        if (projectUnit.IsSynchro == true)
+                        {
+                            this.ckIsSynchro.Checked = true;
+                        }
                     }
                 }
             }
@@ -109,6 +114,14 @@ namespace FineUIPro.Web.ProjectData
                 newProjectUnit.PlanCostA = Funs.GetNewDecimalOrZero(this.nbPlanCostA.Text.Trim());
                 newProjectUnit.PlanCostB = Funs.GetNewDecimalOrZero(this.nbPlanCostB.Text.Trim());
                 newProjectUnit.ContractRange = this.txtContractRange.Text.Trim();
+                if (this.ckIsSynchro.Checked)
+                {
+                    newProjectUnit.IsSynchro = true;
+                }
+                else
+                {
+                    newProjectUnit.IsSynchro = false;
+                }
                 BLL.ProjectUnitService.UpdateProjectUnit(newProjectUnit);
                 Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(newProjectUnit.UnitId);
                 if (unit != null)

SGGL/FineUIPro.Web/ProjectData/ProjectUnitSave.aspx.designer.cs

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