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

DataBase/版本日志/SGGLDB_V2023-10-30.sql

@@ -0,0 +1,45 @@
+ALTER TABLE [dbo].[Base_Project] ADD IsCNCECShow BIT NULL
+GO
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'是否向集团展示' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'IsCNCECShow'
+GO
+UPDATE Base_Project SET IsCNCECShow= 1 WHERE ProjectState=1
+GO
+UPDATE Base_Project SET IsCNCECShow= 0 WHERE IsCNCECShow IS NULL
+GO
+
+ALTER VIEW [dbo].[View_License_LicenseManager]
+AS
+/*现场安全许可证*/
+SELECT LicenseManager.LicenseManagerId, 
+	LicenseManager.ProjectId, 
+	LicenseManager.LicenseTypeId, 
+	LicenseManager.LicenseManagerCode, 
+	LicenseManager.LicenseManageName, 
+	LicenseManager.UnitId, 
+	LicenseManager.LicenseManageContents, 
+	LicenseManager.CompileMan, 
+	LicenseManager.CompileDate, 
+	LicenseManager.States,
+	Project.ProjectCode,
+	Project.ProjectName,
+	Project.IsCNCECShow,
+	LicenseType.LicenseTypeName,
+	Unit.UnitName,
+	Users.PersonName,
+	LicenseManager.WorkAreaId,
+	--WorkArea.WorkAreaName,
+	LicenseManager.StartDate,
+	LicenseManager.EndDate,
+	LicenseManager.ApplicantMan,
+	WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
+				    where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
+					FOR XML PATH('')), 1, 1,'')
+FROM dbo.License_LicenseManager AS LicenseManager
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
+LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
+LEFT JOIN dbo.Person_Persons AS Users ON Users.PersonId = LicenseManager.CompileMan
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
+
+GO

SGGL/BLL/ProjectData/ProjectService.cs

@@ -125,7 +125,7 @@
                 City = project.City,
                 EnglishRemark = project.EnglishRemark,
                 ProjectRealCode=project.ProjectRealCode,
-
+                IsCNCECShow=project.IsCNCECShow,
             };
             db.Base_Project.InsertOnSubmit(newProject);
             db.SubmitChanges();
@@ -171,6 +171,7 @@
                 newProject.City = project.City;
                 newProject.EnglishRemark = project.EnglishRemark;
                 newProject.ProjectRealCode = project.ProjectRealCode;
+                newProject.IsCNCECShow = project.IsCNCECShow;
                 db.SubmitChanges();
                 HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
                 CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);
@@ -374,6 +375,29 @@
             }
         }
 
+        #region
+        /// <summary>
+        ///  项目表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitCNCECShowProjectDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+        {
+            dropName.Items.Clear();
+            dropName.DataValueField = "ProjectId";
+            dropName.DataTextField = "ProjectName";
+            dropName.DataSource = (from x in Funs.DB.Base_Project
+                                   where x.IsCNCECShow == true
+                                   orderby x.ProjectCode descending
+                                   select x).ToList();
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+        #endregion
+
         #region 项目表下拉框 --施工项目
         /// <summary>
         ///  项目表下拉框

SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs

@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.DataShow
                          LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId 
                           LEFT JOIN SitePerson_Person AS Person ON Person.PersonId = Record.PersonId 
                           LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId
-                         WHERE 1=1  ";
+                         WHERE IsCNCECShow=1  ";
 
                 if (rbType.SelectedValue == "0")
                 {
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.DataShow
                                  LEFT JOIN Sys_Const AS AccidentType ON AccidentType.ConstValue = Record.AccidentTypeId AND GroupId='AccidentReportRegistration'
                                 LEFT JOIN Base_Project AS Project ON Record.ProjectId = Project.ProjectId
                                 LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Record.UnitId
-                                WHERE 1 = 1   ";
+                                WHERE IsCNCECShow=1   ";
                 if (rbType.SelectedValue == "2")
                 {
                     strSql += " AND Record.AccidentDegree ='1'";

SGGL/FineUIPro.Web/DataShow/Check.aspx.cs

@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
                           + @" FROM dbo.Supervise_SuperviseCheckReport AS S"
                           + @" LEFT JOIN dbo.Base_Project AS P ON P.ProjectId=S.ProjectId"
                           + @" LEFT JOIN dbo.Base_Unit AS U ON U.UnitId=S.UnitId"
-                          + @" WHERE 1=1 ";
+                          + @" WHERE IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 strSql += " AND  S.CheckType= @CheckType";
                 listStr.Add(new SqlParameter("@CheckType", this.rbCom.SelectedValue));
@@ -74,7 +74,7 @@ namespace FineUIPro.Web.DataShow
                         ,CheckTeam= STUFF((SELECT ',' + PersonName FROM dbo.Person_Persons where PATINDEX('%,' + RTRIM(PersonId) + ',%',',' +C.LeaderIds + ',')>0 FOR XML PATH('')), 1, 1,'')
                         from Check_ProjectLeaderCheck AS C
                         LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
-                            where  1=1 ";
+                            where  IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {
@@ -108,7 +108,7 @@ namespace FineUIPro.Web.DataShow
                             LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
                             LEFT JOIN Person_Persons AS U ON C.CheckManId=U.PersonId
                             LEFT JOIN Base_Unit AS Ut ON C.ResponsibleUnit=Ut.UnitId
-                            where  1=1 ";
+                            where  IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {
@@ -141,7 +141,7 @@ namespace FineUIPro.Web.DataShow
                         ,UnitName= STUFF((SELECT ',' + UnitName FROM dbo.Base_Unit where PATINDEX('%,' + RTRIM(UnitId) + ',%',',' +(C.PartInUnits) + ',')>0 FOR XML PATH('')), 1, 1,'')
                         from Check_CheckSpecial AS C
                         LEFT JOIN Base_Project AS P ON C.ProjectId =P.ProjectId
-                        where  1=1 ";
+                        where  IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {

SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -38,20 +38,20 @@ namespace FineUIPro.Web.DataShow
 
             strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,CompileDate,EQType
                     FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
-                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType
+                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'特种设备' AS EQType,IsCNCECShow
                     FROM InApproveManager_EquipmentInItem AS Item 
                     LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId 
                     LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
                     LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
                     LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId 
                     UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
-                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType
+                    ,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,EQ.CompileDate,'一般设备' AS EQType,IsCNCECShow
                     FROM InApproveManager_GeneralEquipmentInItem AS Item 
                     LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId 
                     LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId 
                     LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
                     LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId ) V
-                    WHERE 1=1 ";
+                    WHERE IsCNCECShow=1 ";
 
             //strSql += " AND  V.IsUsed = @IsUsed";
             //listStr.Add(new SqlParameter("@IsUsed", "1"));

SGGL/FineUIPro.Web/DataShow/EduTrain.aspx.cs

@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
              from EduTrain_TrainRecord AS TrainRecord 
              LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId 
               LEFT JOIN Base_Project AS Project ON TrainRecord.ProjectId=Project.ProjectId 
-             WHERE 1=1 ";
+             WHERE IsCNCECShow=1 ";
 
             strSql += " AND TrainType.TrainType =@TrainType";
             listStr.Add(new SqlParameter("@TrainType", this.rbType.SelectedValue));

SGGL/FineUIPro.Web/DataShow/Emergency.aspx.cs

@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
             if (!IsPostBack)
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 ddlPageSize2.SelectedValue = Grid2.PageSize.ToString();
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.DataShow
                     LEFT JOIN Base_Unit AS Unit ON Em.UnitId=Unit.UnitId 
                     LEFT JOIN Base_Project AS Project ON Em.ProjectId=Project.ProjectId 
                     LEFT JOIN Base_EmergencyType AS EmergencyType ON Em.EmergencyTypeId=EmergencyType.EmergencyTypeId
-                     WHERE 1=1  ";
+                     WHERE IsCNCECShow=1  ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {
@@ -257,7 +257,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Project AS Project ON List.Projectid = Project.ProjectId
                         LEFT JOIN Sys_Const AS DrillRecordType ON DrillRecordType.ConstValue = List.DrillRecordType 
                         and DrillRecordType.GroupId='DrillRecordType'
-                        WHERE 1=1   ";
+                        WHERE IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {

SGGL/FineUIPro.Web/DataShow/HJGLDefect.aspx.cs

@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
                         FROM HJGL_Batch_NDEItem AS Item 
                         LEFT JOIN HJGL_Batch_NDE AS Checks ON Item.NDEID =Checks.NDEID
                         LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId 
-                        WHERE 1=1  ";      
+                        WHERE IsCNCECShow=1  ";      
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/HJGLWelder.aspx.cs

@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow
                     LEFT JOIN Base_Project AS Project ON Welder.ProjectId = Project.ProjectId
                     LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Welder.UnitId
                     LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Welder.TeamGroupId
-                    WHERE  Welder.WorkPostId=@WorkPostId  AND Welder.ProjectId IS NOT NULL";
+                    WHERE IsCNCECShow=1 AND Welder.WorkPostId=@WorkPostId  AND Welder.ProjectId IS NOT NULL";
                                 List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@WorkPostId", Const.WorkPost_Welder));
             if (this.drpProject.SelectedValue !=Const._Null)

SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 LargerHazard = (from x in Funs.DB.Solution_LargerHazard
                                 join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
                                 where y.ProjectState == Const.ProjectState_1
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/License.aspx.cs

@@ -22,8 +22,8 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
-                // 绑定表格t
+                // 绑定表格
                 BindGrid();
             }
         }
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
                         ,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
                         ,V.CompileMan,V.CompileDate,V.States
                         FROM View_License_LicenseManager AS V
-                        WHERE 1=1";
+                        WHERE IsCNCECShow=1 ";
             if (this.rbType.SelectedValue=="2")
             {
                 strSql += " AND  V.States = @WorkStates";

SGGL/FineUIPro.Web/DataShow/Meeting.aspx.cs

@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -96,7 +96,7 @@ namespace FineUIPro.Web.DataShow
                             ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
                             FROM Meeting_SafetyLeaderGroupMeeting AS Meeting 
                             LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId 
-                            where  1=1 ";
+                            where  IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {
@@ -127,15 +127,15 @@ namespace FineUIPro.Web.DataShow
             {
                 string strSql = @"SELECT ProjectId,ProjectName, ID, MeetingName, MeetingDate,MeetingHours,HostMan,AttentPersonNum,AttentPerson 
                                 FROM (SELECT  Project.ProjectId,Project.ProjectName,Meeting.MonthMeetingId AS ID,Meeting.MonthMeetingName AS MeetingName,Meeting.MonthMeetingDate AS MeetingDate,Meeting.MeetingHours
-                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson
+                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow
                                 FROM Meeting_MonthMeeting AS Meeting 
                                 LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId 
                                 union all
                                 SELECT Project.ProjectId,Project.ProjectName,Meeting.WeekMeetingId AS ID,Meeting.WeekMeetingName AS MeetingName,Meeting.WeekMeetingDate AS MeetingDate,Meeting.MeetingHours
-                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson 
+                                ,MeetingHostMan AS HostMan,Meeting.AttentPersonNum,Meeting.AttentPerson,IsCNCECShow 
                                 FROM Meeting_WeekMeeting AS Meeting 
                                 LEFT JOIN Base_Project AS Project ON Meeting.ProjectId=Project.ProjectId ) V
-                            where  1=1 ";
+                            where  IsCNCECShow=1 ";
                 List<SqlParameter> listStr = new List<SqlParameter>();
                 if (this.drpProject.SelectedValue != Const._Null)
                 {

SGGL/FineUIPro.Web/DataShow/Project.aspx.cs

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
                                 , ProjectMoney, DATEDIFF(DAY, Project.StartDate, GETDATE()) AS DayCount, ProjectType.ProjectTypeName AS ProjectTypeName
                                 FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId = Project.UnitId
                                 LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType = ProjectType.ProjectTypeId
-                                WHERE  1 = 1";
+                                WHERE  IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();          
        
             if (this.ckState.SelectedValue != "0")

SGGL/FineUIPro.Web/DataShow/ProjectDivision.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -42,7 +42,7 @@ namespace FineUIPro.Web.DataShow
                         ,(SELECT COUNT(*) FROM WBS_ControlItemProject AS D WHERE D.ProjectId =P.ProjectId ) AS count4
                         ,(SELECT COUNT(*) FROM WBS_ControlItemAndCycle AS E WHERE E.ProjectId =P.ProjectId ) AS count5
                         FROM Base_Project AS P
-                        WHERE P.ProjectState = 1 ";      
+                        WHERE P.IsCNCECShow=1 ";      
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue != Const._Null)
             {

SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs

@@ -21,7 +21,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
                         LEFT JOIN Base_Project AS Project ON Person.ProjectId =Project.ProjectId
                         LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
                         LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
-                        WHERE States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
+                        WHERE IsCNCECShow=1 AND States=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (this.drpProject.SelectedValue !=Const._Null)
             {

SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
 
@@ -39,7 +39,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/QualityControlPoint.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/QualityInstruments.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/QualityPerson.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
                 Funs.DropDownPageSize(this.ddlPageSize);
                 
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -61,7 +61,7 @@ namespace FineUIPro.Web.DataShow
 				 LEFT JOIN Person_Persons AS Persons ON Persons.PersonId=Person.PersonId 
                 LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId 
                 LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Person.UnitId 
-                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 ";
+                LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId=WorkPost.WorkPostId WHERE WorkPost.IsCQMS=1 AND IsCNCECShow=1 ";
                 if (this.drpProject.SelectedValue  != Const._Null)
                 {
                     strSql += " AND Person.ProjectId = @ProjectId";

SGGL/FineUIPro.Web/DataShow/QualityProblem.aspx.cs

@@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/QualityTraining.aspx.cs

@@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/SecurityCost.aspx.cs

@@ -20,7 +20,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -40,7 +40,7 @@ namespace FineUIPro.Web.DataShow
                         FROM CostGoods_CostSmallDetail as cost
                         left join Base_Project as p on cost.ProjectId =p.ProjectId
                         left join Base_Unit as Unit on cost.UnitId =Unit.UnitId
-                        WHERE 1=1";
+                        WHERE  IsCNCECShow=1 ";
 
             if (this.drpProject.SelectedValue != Const._Null)
             {

SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/DataShow/WorkingHours.aspx.cs

@@ -22,7 +22,7 @@ namespace FineUIPro.Web.DataShow
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
-                BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
+                BLL.ProjectService.InitCNCECShowProjectDropDownList(this.drpProject, true);
                 // 绑定表格t
                 BindGrid();
             }
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1";
+            string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where IsCNCECShow=1 ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             string cpara = string.Empty;
             if (this.drpProject.SelectedValue != Const._Null)

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx

@@ -20,7 +20,7 @@
        ShowHeader="false"  Layout="VBox" BoxConfigAlign="Stretch" >
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目信息" 
-                EnableCollapse="true" runat="server" BoxFlex="1"  EnableColumnLines="true" ForceFit="true"
+                EnableCollapse="true" runat="server" BoxFlex="1"  EnableColumnLines="true"
                 DataKeyNames="ProjectId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="ProjectId"
                 AllowSorting="true" SortField="ProjectCode" SortDirection="DESC"  OnSort="Grid1_Sort"                
                 AllowPaging="true" IsDatabasePaging="true"  PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" 
@@ -34,10 +34,12 @@
                                 <f:RadioItem Text="在建" Value="1" Selected="true" />
                                 <f:RadioItem Text="停工" Value="2" />
                                 <f:RadioItem Text="竣工" Value="3" />
-                            </f:RadioButtonList>
+                            </f:RadioButtonList>                           
                             <f:ToolbarSeparator runat="server"></f:ToolbarSeparator>                            
                             <f:TextBox runat="server" Label="名称" ID="txtProjectName" EmptyText="输入查询条件" 
-                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"></f:TextBox>                             
+                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="200px" LabelWidth="50px"></f:TextBox>  
+                             <f:CheckBox runat="server" ID="rbIsCNCECShow" Label="集团穿透展示" LabelWidth="110px"
+                                AutoPostBack="true" OnCheckedChanged="rbIsCNCECShow_CheckedChanged"></f:CheckBox>
                             <f:ToolbarFill runat="server"></f:ToolbarFill>                        
                             <f:Button ID="btnNew" Text="新增" Icon="Add" EnablePostBack="false" Hidden="true" runat="server">
                             </f:Button> 
@@ -54,14 +56,14 @@
                             <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                         </ItemTemplate>
                     </f:TemplateField>
-                    <f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
+                    <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
                         HeaderText="项目号">
                     </f:RenderField>
-                    <f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
+                    <f:RenderField Width="150px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
                         HeaderText="项目编码">
                     </f:RenderField>
                     <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
-                        FieldType="String" HeaderText="项目名称"  HeaderTextAlign="Center" TextAlign="Left">
+                        FieldType="String" HeaderText="项目名称"  HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
                     </f:RenderField>
                  <%--   <f:RenderField Width="200px" ColumnID="ShortName" DataField="ShortName" SortField="ShortName"
                         FieldType="String" HeaderText="简称"  HeaderTextAlign="Center" TextAlign="Left" >
@@ -100,7 +102,10 @@
                     </f:RenderField>    --%>             
                      <f:RenderField Width="250px" ColumnID="ProjectAddress" DataField="ProjectAddress" SortField="ProjectAddress" FieldType="String"
                         HeaderText="项目地址"  HeaderTextAlign="Center" TextAlign="Left">
-                    </f:RenderField>                
+                    </f:RenderField>        
+                     <f:CheckBoxField Width="90px" SortField="IsCNCECShow" RenderAsStaticField="true" DataField="IsCNCECShow"
+                            HeaderText="集团展示" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:CheckBoxField>
                 </Columns>
                 <Listeners>
                     <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

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

@@ -36,7 +36,7 @@ namespace FineUIPro.Web.ProjectData
         private void BindGrid()
         {
             string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
-                          + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工'  ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
+                          + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工'  ELSE '施工中' END) AS ProjectStateName,Project.ProjectState,IsCNCECShow"
                           + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId"
                           + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
                           + @" WHERE 1=1 ";
@@ -51,6 +51,10 @@ namespace FineUIPro.Web.ProjectData
             //    strSql += " AND ProjectId = @ProjectId";
             //    listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
             //}
+            if (this.rbIsCNCECShow.Checked)
+            {
+                strSql += " AND IsCNCECShow=1 ";
+            }
 
             if (!string.IsNullOrEmpty(this.txtProjectName.Text.Trim()))
             {
@@ -344,6 +348,11 @@ namespace FineUIPro.Web.ProjectData
         {
             this.BindGrid();
         }
+
+        protected void rbIsCNCECShow_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            this.BindGrid();
+        }
         #endregion
 
         #region 项目管理人员
@@ -415,6 +424,6 @@ namespace FineUIPro.Web.ProjectData
                 ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
             }
 
-        }
+        }       
     }
 }

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

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
-    
+{
-    
+
-    public partial class ProjectSet {
+
-        
+    public partial class ProjectSet
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ckState 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList ckState;
-        
+
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -74,7 +76,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-        
+
+        /// <summary>
+        /// rbIsCNCECShow 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox rbIsCNCECShow;
+
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-        
+
         /// <summary>
         /// btnOut 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
-        
+
         /// <summary>
         /// lblNumber 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblNumber;
-        
+
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-        
+
         /// <summary>
         /// btnEnter 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnEnter;
-        
+
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -10,7 +10,7 @@
     <form id="form1" runat="server">
     <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
     <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
-        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+        BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="150px">
         <rows>
             <f:FormRow>
                  <Items>
@@ -24,7 +24,7 @@
                     ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
                 </Items>
                 <Items>
-                   <f:TextBox ID="txtShortName" runat="server" Label="简称" LabelWidth="150px" 
+                   <f:TextBox ID="txtShortName" runat="server" Label="简称" 
                        MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
                 </Items>
             </f:FormRow>                     
@@ -60,7 +60,7 @@
                    <f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true" AutoPostBack="true" 
                        OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
                    </f:DropDownList>
-                     <f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px" AutoPostBack="true" OnCheckedChanged="ckbIsForeign_CheckedChanged"></f:CheckBox>                     
+                     <f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" AutoPostBack="true" OnCheckedChanged="ckbIsForeign_CheckedChanged"></f:CheckBox>                     
                 </Items>
             </f:FormRow> 
             <f:FormRow>              
@@ -68,7 +68,7 @@
                     <f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理" 
                         EnableEdit="true" Required="true" ShowRedStar="true">
                     </f:DropDownList>     
-                      <f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
+                      <f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" EnableEdit="true">
                     </f:DropDownList>     
                 </Items>
             </f:FormRow>  
@@ -76,7 +76,7 @@
                 <Items>
                     <f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" EnableEdit="true">
                     </f:DropDownList>     
-                   <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500" ></f:TextBox>
+                   <f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址"  MaxLength="500" ></f:TextBox>
 
                 </Items>
             </f:FormRow>  
@@ -104,7 +104,7 @@
                     ></f:TextBox>
                 </Items>
                 <Items>
-                   <f:TextBox ID="txtCountry" runat="server" Label="国家" MaxLength="50" LabelWidth="150px" ></f:TextBox>
+                   <f:TextBox ID="txtCountry" runat="server" Label="国家" MaxLength="50" ></f:TextBox>
                 </Items>
             </f:FormRow> 
             <f:FormRow>
@@ -122,7 +122,7 @@
                     <f:ContentPanel ID="bottomPanel"  RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
                         <a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank" >拾取坐标</a>
                    </f:ContentPanel>
-                   <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" LabelWidth="150px" Width="300px"></f:TextBox>
+                   <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" Width="300px"></f:TextBox>
                     
                 </Items>
             </f:FormRow>   
@@ -132,8 +132,10 @@
                     ShowRedStar="true"></f:TextBox>
                 </Items>
                 <Items>
-                   <f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
+                 <f:RadioButtonList runat="server" ID="rbIsCNCECShow" Label="集团展示(穿透页面)" ShowRedStar="true" >
-                       MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
+                     <f:RadioItem  Value="True" Text="是" Selected="true"/>
+                     <f:RadioItem  Value="False" Text="否"/>
+                 </f:RadioButtonList>
                 </Items>
             </f:FormRow>
         </rows>

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

@@ -101,6 +101,14 @@ namespace FineUIPro.Web.ProjectData
                         this.txtCity.Text = project.City;
                         this.txtEnglishRemark.Text = project.EnglishRemark;
                         this.txtProjectRealCode.Text = project.ProjectRealCode;
+                        if (project.IsCNCECShow == true)
+                        {
+                            this.rbIsCNCECShow.SelectedValue = "True";
+                        }
+                        else
+                        {
+                            this.rbIsCNCECShow.SelectedValue = "False";
+                        }
                     }
                 }
                 else
@@ -143,6 +151,7 @@ namespace FineUIPro.Web.ProjectData
                 City = this.txtCity.Text.Trim(),
                 EnglishRemark = this.txtEnglishRemark.Text.Trim(),
                 ProjectRealCode=this.txtProjectRealCode.Text.Trim(),
+                IsCNCECShow=Convert.ToBoolean( this.rbIsCNCECShow.SelectedValue),
             };
 
             if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))

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

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
-    
+{
-    
+
-    public partial class ProjectSetSave {
+
-        
+    public partial class ProjectSetSave
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-        
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-        
+
         /// <summary>
         /// drpProjectType 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectType;
-        
+
         /// <summary>
         /// drpProjectState 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-        
+
         /// <summary>
         /// txtContractNo 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractNo;
-        
+
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDuration;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-        
+
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-        
+
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-        
+
         /// <summary>
         /// drpHSSEManager 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHSSEManager;
-        
+
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-        
+
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProjectMoney;
-        
+
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtConstructionMoney;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// txtCountry 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCountry;
-        
+
         /// <summary>
         /// drpProvince 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvince;
-        
+
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-        
+
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-        
+
         /// <summary>
         /// bottomPanel 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel bottomPanel;
-        
+
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-        
+
         /// <summary>
         /// txtProjectRealCode 控件。
         /// </summary>
@@ -281,16 +283,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectRealCode;
-        
+
         /// <summary>
-        /// TextBox2 控件。
+        /// rbIsCNCECShow 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox TextBox2;
+        protected global::FineUIPro.RadioButtonList rbIsCNCECShow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// ckIsUpTotalMonth 控件。
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -317,7 +319,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx

@@ -104,10 +104,10 @@
                <Items>
                    <f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50" Readonly="true" LabelWidth="150px"
                     ShowRedStar="true"></f:TextBox>
-                </Items>
+                    <f:RadioButtonList runat="server" ID="rbIsCNCECShow" Label="集团展示(穿透页面)" Readonly="true">
-                <Items>
+                     <f:RadioItem  Value="True" Text="是" Selected="true"/>
-                   <f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
+                     <f:RadioItem  Value="False" Text="否"/>
-                       MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
+                 </f:RadioButtonList>
                 </Items>
             </f:FormRow>
         </rows>

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

@@ -90,6 +90,14 @@ namespace FineUIPro.Web.ProjectData
                         this.txtCity.Text = project.City;
                         this.txtEnglishRemark.Text = project.EnglishRemark;
                         this.txtProjectRealCode.Text = project.ProjectRealCode;
+                        if (project.IsCNCECShow == true)
+                        {
+                            this.rbIsCNCECShow.SelectedValue = "True";
+                        }
+                        else
+                        {
+                            this.rbIsCNCECShow.SelectedValue = "False";
+                        }
                     }
                 }
             }

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

@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData {
+namespace FineUIPro.Web.ProjectData
-    
+{
-    
+
-    public partial class ProjectSetView {
+
-        
+    public partial class ProjectSetView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-        
+
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-        
+
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-        
+
         /// <summary>
         /// txtProjectType 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectType;
-        
+
         /// <summary>
         /// txtProjectState 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectState;
-        
+
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtStartDate;
-        
+
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEndDate;
-        
+
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtDuration;
-        
+
         /// <summary>
         /// txtProjectManager 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectManager;
-        
+
         /// <summary>
         /// txtConstructionManager 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtConstructionManager;
-        
+
         /// <summary>
         /// txtHSSEManager 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtHSSEManager;
-        
+
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-        
+
         /// <summary>
         /// txtUnitName 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtUnitName;
-        
+
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-        
+
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectMoney;
-        
+
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtConstructionMoney;
-        
+
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-        
+
         /// <summary>
         /// txtCountry 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCountry;
-        
+
         /// <summary>
         /// txtProvince 控件。
         /// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProvince;
-        
+
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-        
+
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-        
+
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-        
+
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-        
+
         /// <summary>
         /// lb1 控件。
         /// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lb1;
-        
+
         /// <summary>
         /// txtProjectRealCode 控件。
         /// </summary>
@@ -272,16 +274,16 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectRealCode;
-        
+
         /// <summary>
-        /// TextBox2 控件。
+        /// rbIsCNCECShow 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox TextBox2;
+        protected global::FineUIPro.RadioButtonList rbIsCNCECShow;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -299,7 +301,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -308,7 +310,7 @@ namespace FineUIPro.Web.ProjectData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/Model/Model.cs

@@ -23810,6 +23810,8 @@ namespace Model
 		
 		private string _ProjectRealCode;
 		
+		private System.Nullable<bool> _IsCNCECShow;
+		
 		private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
 		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@@ -24228,6 +24230,8 @@ namespace Model
     partial void OnEnglishRemarkChanged();
     partial void OnProjectRealCodeChanging(string value);
     partial void OnProjectRealCodeChanged();
+    partial void OnIsCNCECShowChanging(System.Nullable<bool> value);
+    partial void OnIsCNCECShowChanged();
     #endregion
 		
 		public Base_Project()
@@ -25001,6 +25005,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")]
+		public System.Nullable<bool> IsCNCECShow
+		{
+			get
+			{
+				return this._IsCNCECShow;
+			}
+			set
+			{
+				if ((this._IsCNCECShow != value))
+				{
+					this.OnIsCNCECShowChanging(value);
+					this.SendPropertyChanging();
+					this._IsCNCECShow = value;
+					this.SendPropertyChanged("IsCNCECShow");
+					this.OnIsCNCECShowChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
 		{
@@ -39495,10 +39519,10 @@ namespace Model
 		
 		private string _SaveHandleMan;
 		
-		private string _WorkPackageId;
-		
 		private string _WorkPackageName;
 		
+		private string _WorkPackageId;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Person_Persons> _Person_Persons;
@@ -39555,10 +39579,10 @@ namespace Model
     partial void OnProposeUnitIdChanged();
     partial void OnSaveHandleManChanging(string value);
     partial void OnSaveHandleManChanged();
-    partial void OnWorkPackageIdChanging(string value);
-    partial void OnWorkPackageIdChanged();
     partial void OnWorkPackageNameChanging(string value);
     partial void OnWorkPackageNameChanged();
+    partial void OnWorkPackageIdChanging(string value);
+    partial void OnWorkPackageIdChanged();
     #endregion
 		
 		public Check_CheckControl()
@@ -40037,26 +40061,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
-		public string WorkPackageId
-		{
-			get
-			{
-				return this._WorkPackageId;
-			}
-			set
-			{
-				if ((this._WorkPackageId != value))
-				{
-					this.OnWorkPackageIdChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageId = value;
-					this.SendPropertyChanged("WorkPackageId");
-					this.OnWorkPackageIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
 		public string WorkPackageName
 		{
@@ -40077,6 +40081,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
+		public string WorkPackageId
+		{
+			get
+			{
+				return this._WorkPackageId;
+			}
+			set
+			{
+				if ((this._WorkPackageId != value))
+				{
+					this.OnWorkPackageIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageId = value;
+					this.SendPropertyChanged("WorkPackageId");
+					this.OnWorkPackageIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -100703,10 +100727,10 @@ namespace Model
 		
 		private string _HazardValue;
 		
-		private string _WorkPackageId;
-		
 		private string _WorkPackageName;
 		
+		private string _WorkPackageId;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -100807,10 +100831,10 @@ namespace Model
     partial void OnRegisterTypes4IdChanged();
     partial void OnHazardValueChanging(string value);
     partial void OnHazardValueChanged();
-    partial void OnWorkPackageIdChanging(string value);
-    partial void OnWorkPackageIdChanged();
     partial void OnWorkPackageNameChanging(string value);
     partial void OnWorkPackageNameChanged();
+    partial void OnWorkPackageIdChanging(string value);
+    partial void OnWorkPackageIdChanged();
     #endregion
 		
 		public HSSE_Hazard_HazardRegister()
@@ -101748,26 +101772,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
-		public string WorkPackageId
-		{
-			get
-			{
-				return this._WorkPackageId;
-			}
-			set
-			{
-				if ((this._WorkPackageId != value))
-				{
-					this.OnWorkPackageIdChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageId = value;
-					this.SendPropertyChanged("WorkPackageId");
-					this.OnWorkPackageIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
 		public string WorkPackageName
 		{
@@ -101788,6 +101792,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
+		public string WorkPackageId
+		{
+			get
+			{
+				return this._WorkPackageId;
+			}
+			set
+			{
+				if ((this._WorkPackageId != value))
+				{
+					this.OnWorkPackageIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageId = value;
+					this.SendPropertyChanged("WorkPackageId");
+					this.OnWorkPackageIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -283052,6 +283076,8 @@ namespace Model
 		
 		private string _ProjectName;
 		
+		private System.Nullable<bool> _IsCNCECShow;
+		
 		private string _LicenseTypeName;
 		
 		private string _UnitName;
@@ -283264,6 +283290,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCNCECShow", DbType="Bit")]
+		public System.Nullable<bool> IsCNCECShow
+		{
+			get
+			{
+				return this._IsCNCECShow;
+			}
+			set
+			{
+				if ((this._IsCNCECShow != value))
+				{
+					this._IsCNCECShow = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LicenseTypeName", DbType="NVarChar(50)")]
 		public string LicenseTypeName
 		{