From f93ed7c8290111f816d926cc670391c02c6d2b36 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 31 Oct 2023 18:03:55 +0800 Subject: [PATCH] 2023/10/31 --- .vs/SGGL_CWCEC/v17/.wsuo | Bin 31744 -> 32256 bytes DataBase/版本日志/SGGLDB_WH_2023-10-31-.sql | 306 ++++ .../Solution/CQMSConstructSolutionService.cs | 2 + .../AttachFile/webuploader.aspx.cs | 10 +- .../CQMS/Solution/ConstructSolutionView.aspx | 24 +- .../Solution/ConstructSolutionView.aspx.cs | 14 + .../ConstructSolutionView.aspx.designer.cs | 99 +- .../CQMS/Solution/EditConstructSolution.aspx | 49 +- .../Solution/EditConstructSolution.aspx.cs | 1385 +++++++++-------- .../EditConstructSolution.aspx.designer.cs | 31 +- .../DataShow/QualityInstruments.aspx.cs | 4 +- .../DataShowLocal/NCRStatisc.aspx | 130 ++ .../DataShowLocal/NCRStatisc.aspx.cs | 242 +++ .../DataShowLocal/NCRStatisc.aspx.designer.cs | 206 +++ .../DataShowLocal/NCRStatiscItem.aspx | 88 ++ .../DataShowLocal/NCRStatiscItem.aspx.cs | 166 ++ .../NCRStatiscItem.aspx.designer.cs | 134 ++ .../DataShowLocal/QualityInstruments.aspx | 131 ++ .../DataShowLocal/QualityInstruments.aspx.cs | 253 +++ .../QualityInstruments.aspx.designer.cs | 206 +++ .../DataShowLocal/QualityInstrumentsItem.aspx | 123 ++ .../QualityInstrumentsItem.aspx.cs | 131 ++ .../QualityInstrumentsItem.aspx.designer.cs | 161 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 32 + SGGL/FineUIPro.Web/common/main_new.aspx | 253 ++- SGGL/FineUIPro.Web/common/main_new.aspx.cs | 170 +- SGGL/FineUIPro.Web/common/main_new0.aspx | 2 +- SGGL/FineUIPro.Web/common/main_new0.aspx.cs | 68 +- SGGL/FineUIPro.Web/common/main_new1.aspx | 9 +- SGGL/FineUIPro.Web/common/main_new1.aspx.cs | 32 +- SGGL/Model/Model.cs | 72 +- 31 files changed, 3748 insertions(+), 785 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-10-31-.sql create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatisc.aspx create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatisc.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatisc.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatiscItem.aspx create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatiscItem.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/NCRStatiscItem.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstruments.aspx create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstruments.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstruments.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstrumentsItem.aspx create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstrumentsItem.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DataShowLocal/QualityInstrumentsItem.aspx.designer.cs diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index fe8cfccf5acedffd5e3b94e93b042ec67f081ae9..aadabc24bf73dc4edaf5093e9c267f0b8cbea900 100644 GIT binary patch delta 1298 zcmb_cO-vI(6z+_f4fPEy37SYWaguM}oA=(lneUs-#=b)A z2TTnKYb~Ako_)2yfozM#62nnp9E#Bpbhv_=RfjWZShwhzl(Q332)Tq3!a{Osq>;a# zz-OtZHB-qVb6&6_UTFI3$hud=(^vQ&@;4KCRb->+X9(<$#51e<{U)AG6#u#&XsfET>pl{CaUFU<@)@_;a@1M zsWtoLuz4{Z;&wOl*x$mof#FN3pIxhz09C5Mty~N!x@4gGn_Q-meNEwHNu#5 zT;dEkc2j`c8lLzhoyQg_FR#Z8_L-I!sJ!4-b|EhiqcmZ2*&cvSG;(yPMlDx|5HoU{ z0P1mHeqBaodut0&S^a_57QB{U6>m^bDJaId$VSK0p!>3sGE*eIeE;ZiNQ<(Tf+<)n z>k;5AYK1y}oD&pAR2N#aNq! zN?RGqLK>TG9|I<|FW7LpLq++RgFQGol!_Cf4OWsGt>IdXg&VOk9K_i&2fhlIp`wmB zReFD3dUG-%yy#&`+pZN$v0?)#)-154AOYd(PVqo zaG`VY;DyGkiS`}6@CT5HS11$y#VAF*Pi6B%22|{T{g-|QjK~xM9PfV!IXxn`>v44v4 zwnh13@PbEuU!e9kY8=uTEThqDLV;Uk;SL%B6K1$YRvw@(MCSrn4K0Pl#5xHvwN~M4 z=sDcR_evy`w^PNgWB5wxhex8!x0N`+U9^sxFpWmogc7&HHvs1FQr|@xh$L|3=G8@9 z>(k_kY-XXAxSUzQtv(G`AA~UxxyEz-3WFzT447~aEwZaB8>Nr??7WpccMPMR-64UE}OMy>1tiZcV|4T7SP2r zwtE`tfkry*Ip~b*^X|rc+KnocFufS+fLF6ssAs)6cT3~i(w2*F76t)dvjLudc%8+I ud97S5saj%eJg+4*bz(e`FQv)}wXCZ7WHMPUq>}vYN=B+zynCYc4bLCB*pbx$ diff --git a/DataBase/版本日志/SGGLDB_WH_2023-10-31-.sql b/DataBase/版本日志/SGGLDB_WH_2023-10-31-.sql new file mode 100644 index 00000000..5d91c447 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-10-31-.sql @@ -0,0 +1,306 @@ +alter table dbo.Solution_CQMSConstructSolution + add Content NVARCHAR(2000) +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'Solution_CQMSConstructSolution', + 'COLUMN', 'Content' +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 top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +where approve.ApproveMan=@userId ) + +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)--%> + + + + + + + + + + + + + + + + + + <%-- @@ -159,7 +181,7 @@ - + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs index 25efaf6b..cc468c57 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using System; using System.Collections.Generic; using System.Linq; @@ -69,6 +70,8 @@ namespace FineUIPro.Web.CQMS.Solution { txtEdition.Text = constructSolution.Edition.ToString(); } + txtDocContent.Text = HttpUtility.HtmlDecode(constructSolution.Content); + bindApprove(); BindZYRole(); BindZLRole(); @@ -115,6 +118,8 @@ namespace FineUIPro.Web.CQMS.Solution BLL.CQMSConstructSolutionApproveService.UpdateConstructSolutionApprove(approve); } } + + AddAttachTab(); } } } @@ -354,6 +359,15 @@ namespace FineUIPro.Web.CQMS.Solution gvApprove.DataSource = list; gvApprove.DataBind(); } + private void AddAttachTab() + { + PageContext.RegisterStartupScript(TabStrip1.GetAddTabReference("dynamic_tab2", + String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}", + -1, ConstructSolutionId, Const.CQMSConstructSolutionMenuId), "附件", + IconHelper.GetIconUrl(Icon.Attach), false)); + + // PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/DocManage&menuId={1}", hdDocId.Text, Const.DocManageMenuId))); + } public string man(Object man) { diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs index bce7c845..89eb03b4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Solution { - - - public partial class ConstructSolutionView { - +namespace FineUIPro.Web.CQMS.Solution +{ + + + public partial class ConstructSolutionView + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// ContentPanel2 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ContentPanel ContentPanel2; - + /// /// Form2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form Form2; - + /// /// txtProjectName 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtProjectName; - + /// /// txtCode 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCode; - + /// /// drpUnit 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpUnit; - + /// /// txtSolutionName 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSolutionName; - + /// /// drpModelType 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox drpModelType; - + /// /// txtSpecialType 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSpecialType; - + /// /// txtCompileDate 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCompileDate; - + /// /// txtEdition 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtEdition; - + /// /// txtCNProfessional 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCNProfessional; - + /// /// txtUnitWork 控件。 /// @@ -146,25 +148,34 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtUnitWork; - + /// - /// plfile 控件。 + /// TabStrip1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Panel plfile; - + protected global::FineUIPro.TabStrip TabStrip1; + /// - /// imgBtnFile 控件。 + /// SimpleForm2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button imgBtnFile; - + protected global::FineUIPro.SimpleForm SimpleForm2; + + /// + /// txtDocContent 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HtmlEditor txtDocContent; + /// /// Panel2 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Panel1 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// trOne 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trOne; - + /// /// Panel3 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel3; - + /// /// trTwo 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trTwo; - + /// /// Panel4 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel4; - + /// /// trThree 控件。 /// @@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trThree; - + /// /// Panel5 控件。 /// @@ -236,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel5; - + /// /// trFour 控件。 /// @@ -245,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trFour; - + /// /// Panel6 控件。 /// @@ -254,7 +265,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel6; - + /// /// trFive 控件。 /// @@ -263,7 +274,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trFive; - + /// /// Panel7 控件。 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel7; - + /// /// trSixe 控件。 /// @@ -281,7 +292,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree trSixe; - + /// /// plApprove2 控件。 /// @@ -290,7 +301,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FormRow plApprove2; - + /// /// gvApprove 控件。 /// @@ -299,7 +310,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid gvApprove; - + /// /// Label1 控件。 /// @@ -308,7 +319,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// Label3 控件。 /// @@ -317,7 +328,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label3; - + /// /// Label2 控件。 /// @@ -326,7 +337,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label2; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx index c152f2d0..1e1393b6 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx @@ -1,10 +1,11 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditConstructSolution.aspx.cs" Inherits="FineUIPro.Web.CQMS.Solution.EditConstructSolution" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditConstructSolution.aspx.cs" Inherits="FineUIPro.Web.CQMS.Solution.EditConstructSolution" ValidateRequest="false" %> 施工方案 +