完善PC待办功能

.gitignore

@@ -11,3 +11,4 @@
 /SGGL/FineUIPro.Web/FileUpload/CQMS
 /SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
 /SGGLPackFile.rar
+/SGGL/FineUIPro.Web/FileUpload/Solution/2023-08

DataBase/版本日志/SGGLDB_WH_2023-08-15.sql

@@ -1,8 +0,0 @@
-alter table ProcessControl_InspectionManagement alter column AcceptanceCheckMan nvarchar(500)  null
-GO
-alter table sys_const alter Column ConstValue nvarchar(200)
-GO
-alter table Comprehensive_InspectionPerson alter column InspectionPersonCode nvarchar(100)  null
-GO
-alter table Comprehensive_InspectionMachine alter column InspectionMachineCode nvarchar(100)  null
-GO

DataBase/版本日志/SGGLDB_WH_2023-08-17.sql

@@ -0,0 +1,301 @@
+alter table ProcessControl_InspectionManagement alter column AcceptanceCheckMan nvarchar(500)  null
+GO
+alter table Sys_Const alter Column ConstValue nvarchar(500) null
+GO
+alter table Comprehensive_InspectionPerson alter column InspectionPersonCode nvarchar(100)  null
+GO
+alter table Comprehensive_InspectionMachine alter column InspectionMachineCode nvarchar(100)  null
+GO
+
+
+--获取当前人待办事项
+ALTER  PROCEDURE [dbo].[Sp_Project_GetToDoItems]     
+	@projectId NVARCHAR(50)=NULL,
+	@userId NVARCHAR(200)=NULL
+AS  
+/*获取当前人待办事项*/          
+BEGIN
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'安全巡检待整改' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND 
+((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) 
+)		
+UNION ALL
+
+SELECT HazardRegisterId AS DataId
+	,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
+	,'安全巡检待确认' AS MenuName
+	,register.RegisterDef AS Content
+	,UserId
+	,users.UserName
+	,register.RegisterDate AS DataTime
+	,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
+	,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
+FROM HSSE_Hazard_HazardRegister AS register 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE register.ProjectId=@projectId AND 
+register.states = '2' AND register.CheckManId =@userId
+
+UNION ALL
+SELECT CheckControlCode AS DataId
+	,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
+	,'质量巡检待处理' AS MenuName
+	,checkControl.QuestionDef AS Content
+	,UserId
+	,users.UserName
+	,checkControl.CheckDate AS DataTime
+	,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
+	,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl
+FROM Check_CheckControl AS checkControl 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE checkControl.ProjectId=@projectId AND 
+checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+
+UNION ALL
+SELECT GJSXID AS DataId
+	,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
+	,'关键事项待处理' AS MenuName
+	,GJSX.Detail AS Content
+	,users.UserId
+	,users.UserName
+	,GJSX.CreateDate AS DataTime
+	,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
+	,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
+FROM GJSX 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE GJSX.ProjectId=@projectId AND 
+GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
+and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
+or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
+)
+
+UNION ALL
+SELECT InspectionEquipmentId AS DataId
+	,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId
+	,'设备材料报验待确认' AS MenuName
+	,Equipment.InspectionName AS Content
+	,UserId
+	,users.UserName
+	,Equipment.InspectionDate AS DataTime
+	,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl
+FROM Comprehensive_InspectionEquipment AS Equipment 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Equipment.ProjectId=@projectId and
+Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'人员报验待确认' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.CompileDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and
+Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'机具报验待确认' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.CompileDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and
+Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT ConstructSolutionId AS DataId
+	,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
+	,'施工方案待处理' AS MenuName
+	,Solution.SolutionName AS Content
+	,UserId
+	,users.UserName
+	,Solution.CompileDate AS DataTime
+	,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
+FROM Solution_CQMSConstructSolution AS Solution 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Solution.ProjectId=@projectId and
+Solution.State!='3' AND Solution.ConstructSolutionId in (select ConstructSolutionId from Solution_CQMSConstructSolutionApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
+UNION ALL
+SELECT InspectionId AS DataId
+	,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
+	,'共检通知单待处理' AS MenuName
+	,InspectionManagement.AcceptanceSite AS Content
+	,UserId
+	,users.UserName
+	,InspectionManagement.CompileDate AS DataTime
+	,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
+FROM ProcessControl_InspectionManagement AS InspectionManagement 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE InspectionManagement.ProjectId=@projectId and
+dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
+UNION ALL
+SELECT CheckSpecialId AS DataId
+	,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
+	,'专项检查' AS MenuName
+	,CheckItemSet.CheckItemName AS Content
+	,UserId
+	,users.UserName
+	,CheckSpecial.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
+FROM Check_CheckSpecial AS CheckSpecial 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
+WHERE CheckSpecial.ProjectId=@projectId and
+dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
+UNION ALL
+SELECT CheckColligationId AS DataId
+	,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
+	,'综合检查待处理' AS MenuName
+	,case CheckType when '0' then '周检' when '1' then '月检' else '其它' end AS Content
+	,users.UserId
+	,users.UserName
+	,CheckColligation.CheckTime AS DataTime
+	,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
+	,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
+FROM Check_CheckColligation AS CheckColligation 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
+LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
+WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
+UNION ALL
+SELECT PatrolPlanId AS DataId
+	,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
+	,'风险巡检待处理' AS MenuName
+	,HazardListItem.HazardItems AS Content
+	,UserId
+	,users.UserName
+	,PatrolPlan.LimitCheckDate AS DataTime
+	,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
+	,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
+FROM Hazard_PatrolPlan AS PatrolPlan 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
+WHERE HazardListItem.ProjectId=@projectId and
+dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
+and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'特种作业人员资质还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'天过期' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and
+dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
+UNION ALL
+SELECT PersonQuality.PersonId AS DataId
+	,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
+	,'特种作业人员资质已过期'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'天' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,PersonQuality.LimitDate AS DataTime
+	,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
+	,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
+FROM QualityAudit_PersonQuality AS PersonQuality 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
+WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and
+PersonQuality.LimitDate<getdate()
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'人员报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'天过期' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.CompileDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
+dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate
+UNION ALL
+SELECT InspectionPersonId AS DataId
+	,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
+	,'人员报验已过期'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'天' AS MenuName
+	,Person.PersonName AS Content
+	,UserId
+	,users.UserName
+	,Person.CompileDate AS DataTime
+	,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
+FROM Comprehensive_InspectionPerson AS Person 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
+Person.ValidityDate<getdate()
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'机具报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'天过期' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.CompileDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
+dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate
+UNION ALL
+SELECT InspectionMachineId AS DataId
+	,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
+	,'机具报验已过期'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'天' AS MenuName
+	,Machine.InspectionMachineName AS Content
+	,UserId
+	,users.UserName
+	,Machine.CompileDate AS DataTime
+	,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
+	,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
+FROM Comprehensive_InspectionMachine AS Machine 
+LEFT JOIN Sys_User AS users ON users.UserId =@userId
+WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
+Machine.NextTestDate<getdate()
+
+
+ORDER BY DataTime DESC 
+END
+
+
+
+
+
+
+
+
+
+
+
+
+GO
+
+

SGGL/BLL/SysManage/UserService.cs

@@ -1298,7 +1298,7 @@ namespace BLL
                     list = (from x in db.Sys_User
                             join y in db.Project_ProjectUser on x.UserId equals y.UserId
                             join z in db.Project_ProjectUnit on x.UnitId equals z.UnitId
-                            where y.ProjectId == projectId && z.ProjectId == projectId && z.UnitType == unitType
+                            where y.ProjectId == projectId && z.ProjectId == projectId && (z.UnitType == unitType || string.IsNullOrEmpty(unitType))
                              && y.IsPost == true
                             orderby x.UserName
                             select x).ToList();

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx

@@ -56,7 +56,7 @@
                 </f:FormRow>--%>
                 <f:FormRow ColumnWidths="50% 10% 30%">
                     <Items>
-                          <f:DropDownList ID="drpAcceptanceCheckMan"  runat="server" Label="检查人" EnableCheckBoxSelect="true"
+                          <f:DropDownList ID="drpAcceptanceCheckMan"  runat="server" Label="检查人" EnableCheckBoxSelect="true" LabelWidth="130px"
                         EnableMultiSelect="true">
                     </f:DropDownList>
                        <%-- <f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人"  LabelAlign="Right" LabelWidth="130px" ></f:TextBox>--%>

SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs

@@ -21,8 +21,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 GetButtonPower();
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
                 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业
-                UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, false);
+                UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false);
                 this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
+                if (!string.IsNullOrEmpty(Request.Params["View"]))
+                {
+                    this.btnSave.Hidden = true;
+                }
                 if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text))
                 {
                     Model.ProcessControl_InspectionManagement inspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim());

SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx

@@ -132,8 +132,6 @@
                                                     <f:Label runat="server" Text="<span style='color:red;'>*</span>附件：" EncodeText="false" ShowRedStar="true" Label="附件：" CssStyle="padding-left:48px" Width="110px" CssClass="marginr" ShowLabel="false" ></f:Label>
                                                     <f:Button ID="imgBtnFile" Text="附件" ToolTip="上传及查看" Icon="TableCell" OnClick="imgBtnFile_Click" runat="server">
                                                     </f:Button>
-                                                    <f:Button ID="btnEditWord" Icon="PageWhiteWord"  OnClick="btnEditWord_Click" runat="server" Text="编辑文档" ToolTip="编辑文档"   >
-                                                    </f:Button>
                                                 </Items>
                                             </f:Panel>
                                         </Items>

SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Solution
+namespace FineUIPro.Web.CQMS.Solution {
-{
+    
-
+    
-
+    public partial class EditConstructSolution {
-    public partial class EditConstructSolution
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// ContentPanel2 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel ContentPanel2;
-
+        
         /// <summary>
         /// Form2 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form Form2;
-
+        
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-
+        
         /// <summary>
         /// txtCode 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCode;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// txtSolutionName 控件。
         /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSolutionName;
-
+        
         /// <summary>
         /// drpModelType 控件。
         /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpModelType;
-
+        
         /// <summary>
         /// drpSpecialType 控件。
         /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpSpecialType;
-
+        
         /// <summary>
         /// txtCompileDate 控件。
         /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtCompileDate;
-
+        
         /// <summary>
         /// txtEdition 控件。
         /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtEdition;
-
+        
         /// <summary>
         /// txtCNProfessional 控件。
         /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownBox txtCNProfessional;
-
+        
         /// <summary>
         /// gvCNPro 控件。
         /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvCNPro;
-
+        
         /// <summary>
         /// txtUnitWork 控件。
         /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownBox txtUnitWork;
-
+        
         /// <summary>
         /// gvUnitWork 控件。
         /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvUnitWork;
-
+        
         /// <summary>
         /// imgBtnFile 控件。
         /// </summary>
@@ -175,16 +173,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button imgBtnFile;
-
+        
-        /// <summary>
-        /// btnEditWord 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnEditWord;
-
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -193,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-
+        
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -202,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-
+        
         /// <summary>
         /// trOne 控件。
         /// </summary>
@@ -211,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trOne;
-
+        
         /// <summary>
         /// Panel3 控件。
         /// </summary>
@@ -220,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel3;
-
+        
         /// <summary>
         /// trTwo 控件。
         /// </summary>
@@ -229,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trTwo;
-
+        
         /// <summary>
         /// Panel4 控件。
         /// </summary>
@@ -238,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel4;
-
+        
         /// <summary>
         /// trThree 控件。
         /// </summary>
@@ -247,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trThree;
-
+        
         /// <summary>
         /// Panel5 控件。
         /// </summary>
@@ -256,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel5;
-
+        
         /// <summary>
         /// trFour 控件。
         /// </summary>
@@ -265,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trFour;
-
+        
         /// <summary>
         /// Panel6 控件。
         /// </summary>
@@ -274,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel6;
-
+        
         /// <summary>
         /// trFive 控件。
         /// </summary>
@@ -283,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trFive;
-
+        
         /// <summary>
         /// Panel7 控件。
         /// </summary>
@@ -292,7 +281,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel7;
-
+        
         /// <summary>
         /// trSixe 控件。
         /// </summary>
@@ -301,7 +290,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trSixe;
-
+        
         /// <summary>
         /// agree 控件。
         /// </summary>
@@ -310,7 +299,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow agree;
-
+        
         /// <summary>
         /// rblIsAgree 控件。
         /// </summary>
@@ -319,7 +308,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rblIsAgree;
-
+        
         /// <summary>
         /// options 控件。
         /// </summary>
@@ -328,7 +317,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow options;
-
+        
         /// <summary>
         /// txtOptions 控件。
         /// </summary>
@@ -337,7 +326,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtOptions;
-
+        
         /// <summary>
         /// optio 控件。
         /// </summary>
@@ -346,7 +335,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow optio;
-
+        
         /// <summary>
         /// btnapprove 控件。
         /// </summary>
@@ -355,7 +344,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnapprove;
-
+        
         /// <summary>
         /// plApprove2 控件。
         /// </summary>
@@ -364,7 +353,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.FormRow plApprove2;
-
+        
         /// <summary>
         /// gvApprove 控件。
         /// </summary>
@@ -373,7 +362,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid gvApprove;
-
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -382,7 +371,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
-
+        
         /// <summary>
         /// Label3 控件。
         /// </summary>
@@ -391,7 +380,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
-
+        
         /// <summary>
         /// Label2 控件。
         /// </summary>
@@ -400,7 +389,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
-
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -409,7 +398,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -418,7 +407,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+        
         /// <summary>
         /// HFConstructSolutionId 控件。
         /// </summary>
@@ -427,7 +416,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField HFConstructSolutionId;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -436,7 +425,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnSubmit 控件。
         /// </summary>
@@ -445,7 +434,7 @@ namespace FineUIPro.Web.CQMS.Solution
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSubmit;
-
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs

@@ -166,6 +166,7 @@ namespace FineUIPro.Web.HSSE.Hazard
                     return;
                 }
                 SaveData(true);
+                PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
             else
             {
@@ -287,15 +288,15 @@ namespace FineUIPro.Web.HSSE.Hazard
                     selectedItem.State = "0";
                     BLL.Hazard_HazardSelectedItemService.UpdateHazardSelectedItem(selectedItem);
                 }
-                if (string.IsNullOrEmpty(Request.Params["Main"]))
+                //if (string.IsNullOrEmpty(Request.Params["Main"]))
-                {
+                //{
-                    PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(str)
+                //    PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(str)
-                 + ActiveWindow.GetHidePostBackReference());
+                // + ActiveWindow.GetHidePostBackReference());
-                }
+                //}
-                else
+                //else
-                {
+                //{
-                    PageContext.RegisterStartupScript(String.Format("window.close();"));
+                //    PageContext.RegisterStartupScript(String.Format("window.close();"));
-                }
+                //}
             }
             Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SecurityRisk);
         }

SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs

@@ -1063,6 +1063,7 @@ namespace FineUIPro.Web.SysManage
                 Funs.DB.Sys_Const.InsertOnSubmit(sysSet3);
                 Funs.DB.SubmitChanges();
             }
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
         }
         #endregion
 

SGGL/WebAPI/Controllers/CQMS/InspectionManagementController.cs

@@ -29,8 +29,17 @@ namespace WebAPI.Controllers.CQMS
                 {
                     newModel.InspectionCode = model.InspectionCode;
                     newModel.IsOnceQualified = model.IsOnceQualified;
-                    newModel.InspectionDate = model.InspectionDate;
+                    if (!string.IsNullOrEmpty(model.InspectionDate.ToString()))
+                    {
+                        newModel.InspectionDate = model.InspectionDate.ToString().Replace("/", "-");
+                    }
                     newModel.UnqualifiedReason = model.UnqualifiedReason;
+                    //附件
+                    var Fjmodel = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == InspectionNoticeMenuId && x.MenuId == Const.InspectionNoticeMenuId);
+                    if (model != null)
+                    {
+                        newModel.AttachUrl = Fjmodel.AttachUrl;
+                    }
 
                     responeData.data = newModel;
                 }
@@ -84,12 +93,14 @@ namespace WebAPI.Controllers.CQMS
             APIUpLoadFileService.SaveAttachUrl(toDoItem);
         }
 
+        
+
         /// <summary>
         /// 返回实体
         /// </summary>
         public class returnPersonQuality
         {
-            public DateTime? InspectionDate { get; set; }
+            public string InspectionDate { get; set; }
 
             public bool? IsOnceQualified { get; set; }
 
@@ -98,6 +109,8 @@ namespace WebAPI.Controllers.CQMS
             public string InspectionCode { get; set; }
 
             public string UnqualifiedReason { get; set; }
+
+            public string AttachUrl { get; set; }
         }
     }
 }