From 3f9510cedec5c4f9a2f3db43a6ab4b1e81ffb7a9 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 19 Oct 2023 21:44:34 +0800 Subject: [PATCH] 2023-10-19 --- .vs/SGGL_CWCEC/v17/.wsuo | Bin 31744 -> 32256 bytes .../CQMSConstructSolutionApproveService.cs | 55 ++++ SGGL/BLL/SysManage/UserService.cs | 9 +- .../CQMS/Solution/ConstructSolution.aspx | 7 +- .../CQMS/Solution/ConstructSolution.aspx.cs | 38 +-- .../ConstructSolution.aspx.designer.cs | 73 +++--- .../CQMS/Solution/EditConstructSolution.aspx | 16 +- .../Solution/EditConstructSolution.aspx.cs | 242 +++++------------- .../EditConstructSolution.aspx.designer.cs | 54 ---- .../DocManage/DocManageEdit.aspx | 9 +- .../DocManage/DocManageEdit.aspx.cs | 1 + .../FineUIPro.Web/common/mainProject2.aspx.cs | 3 +- SGGL/Model/Model.cs | 72 ++++-- 13 files changed, 250 insertions(+), 329 deletions(-) diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index 9f27315ce43b4b9ac2bb142167cd9a3698a4d752..9975ed554be80a787fe07db400c732713b34022c 100644 GIT binary patch delta 1589 zcmb_cU1%It6rMXXo2=>1cHNyMoBvIT*;KPSn@)DOSyrdSNZQDDF|iiJ=BK;cc2g?q zjM_xVXi<@>*!_I)v7|nTAjFOjqCNyH7(tApph!UwAAInkl?+(XuIDDZbg2>%z3|OB zbIzGN=R4=zYyZmZ-`UDZQOSMsl=C|Kj@>E#llwNh)Bq2pe6RMk6GF4r5uF5-DSv;v+x%}k6W!M;He#)cuHqIwV z;3cT>=_I|zh5vPv&wkE_SK($pyU4~XQ_GLb|IRM7#jYvh^fg^(=Vs(`o$9}Ydjp!Y z;kOx^h80+1bB-IxGK>b|F!fHn7TluDEXBXEORh4BP;*4bf(4q{Y_V7;*tGoytd&$5hZv%c-pFvIyhi9wCqgBZRiag+r=1v|UoBZXAX06Z8^n4UnbkbWJB%awVPf+MIZvp;jzE5F%T==-sj+-+HvtAD5Cm0*UzP5XOdk#(J_ zUyzLhB+n!To zkeq9GEsC7lP{qR@hNUmDBwYOrlW}_Z#q!;2UVeIN-~DqdJ$VY(oNMVu@nXVctQ%JH z>_x+9+@`tX4KT)Sd_ECDWPb#! zC6dYHu%60mso{e2&arP9#!jRqnp~VYk?|Z}r^^@}9qDq(fL$8E@lu%5l9_<#OX=l# vhF9jpsI(7k({^)3x?nslE-#2M77Tn}is1ZW6!*>kaIsn2a@5&YV>R;!n65feZi1GSLMX~^KOl0o)>9Jwm&4;@wz5;}E=I&|#lK#H`zH}1qFp#^^7Gw;pk`@TOu@4Xpw6U-m* zYDx;mP9FdKweSf-B_$?g~iezLVipWk@|T<_tce~4_*#YbKKK9}D>{!v297T3MCBR$((K@QnYT#V2` z=p=LzG(wy(KdN|p$fD_0=f^j*(o}GDNc-Omls4g-SIw|mPL89NGvJIW;@Lk;b|BStL4B0WEV$e$d*Onv8XNk;`Ykl%Lj{b9Ltp!Yvm@u zI2xf0To+bo7_i^d0awvzOaz=d+bwYlt;P>>Ij!d=a@ONog(3jAi440VlV7I_hc?^Wjz)LrbNG<>M=8HCy|3 z-Dre|?W<1;D|{Z{44#hk%G}tDvqR^SI2Y06u8WBgo9IuB;7UZp#T(UltYuK7nin8f zBV`qR&*jv;gp@GqpL+f{EL)|+T{NmPFo705Z=+G2z`WWj>vZ81cN`683BI^j7g~-- zA6dRPwaUkDZ{MX2T|Aq<1%KTq;CybJ9RJpaxKS~)_uBd})R^A6U)+WCsU%7k>+Q1= zC#AFC6S_9%$@NItcs{^CoZltgwbZ^z3Xh5P-htA8DYsY|(EPbU|LbI*gfYpBW>Rq= s%%llo>5}BfhZj19HntMXr2|g#MM_`r;KYoIh2}QlpWXn`H?su40D2cLXaE2J diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs index 0e98b944..1bfad9d2 100644 --- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs +++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs @@ -63,6 +63,7 @@ namespace BLL newApprove.IsAgree = approve.IsAgree; newApprove.ApproveType = approve.ApproveType; newApprove.Edition = approve.Edition; + newApprove.Order=approve.Order; db.SubmitChanges(); } /// @@ -226,9 +227,62 @@ namespace BLL newApprove.ApproveType = approve.ApproveType; newApprove.SignType = approve.SignType; newApprove.Edition = approve.Edition; + newApprove.Order= GetMaxOrderByConstructSolutionId(approve.ConstructSolutionId); db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove); db.SubmitChanges(); } + + public static int GetMaxOrderByConstructSolutionId(string constructSolutionId) + { + int order = 0; + var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove + where x.ConstructSolutionId == constructSolutionId + select x).ToList().Count(); + order = q + 1; + return order; + } + /// + /// 获取当前办理人 + /// + /// + /// + public static Model.Solution_CQMSConstructSolutionApprove GetThisApproveByConstructSolutionId( string constructSolutionId) + { + var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove + where x.ConstructSolutionId == constructSolutionId && x.ApproveDate != null + orderby x.Order + select x).FirstOrDefault(); + return q; + } + public static string GetThisApproveNameByConstructSolutionId(object constructSolutionId) + { + string name = ""; + var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove + where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate != null + orderby x.Order + select x).FirstOrDefault(); + if (q!=null) + { + name = UserService.GetUserNameByUserId(q.ApproveMan); + } + return name; + } + /// + /// 推送待办给下一步办理人 + /// + /// + public static void PushMessageToNextMan(string constructSolutionId) + { + var approve= GetThisApproveByConstructSolutionId(constructSolutionId); + if (approve!=null) + { + + APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", UserService.GetUserNameByUserId(approve.ApproveMan), string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + + } + + } + public static void AddConstructSolutionApproveForApi(Model.Solution_CQMSConstructSolutionApprove approve) { using (var db = new Model.SGGLDB(Funs.ConnString)) @@ -250,6 +304,7 @@ namespace BLL newApprove.ApproveType = approve.ApproveType; newApprove.SignType = approve.SignType; newApprove.Edition = approve.Edition; + newApprove.Order = approve.Order; db.Solution_CQMSConstructSolutionApprove.InsertOnSubmit(newApprove); db.SubmitChanges(); } diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 27a6ef22..7f59e4a1 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -623,9 +623,8 @@ 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.Base_Depart on x.DepartId equals z.DepartId where y.ProjectId == projectId && x.UnitId == unitId && x.IsPost == true && y.IsPost == true && x.UserId != notCopyManId - orderby z.DepartCode, x.UserName + orderby x.UserName select x).ToList(); } else @@ -633,9 +632,8 @@ 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.Base_Depart on x.DepartId equals z.DepartId where y.ProjectId == projectId && x.IsPost == true && y.IsPost == true && x.UserId != notCopyManId - orderby z.DepartCode, x.UserName + orderby x.UserName select x).ToList(); } @@ -643,9 +641,8 @@ namespace BLL else { list = (from x in db.Sys_User - join z in db.Base_Depart on x.DepartId equals z.DepartId where x.UnitId == unitId && x.IsPost == true && x.UserId != notCopyManId - orderby z.DepartCode, x.UserName + orderby x.UserName select x).ToList(); } return list; diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx index f1855649..c1d737dd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx @@ -154,7 +154,12 @@ - + + + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs index 34c56e87..ccc4619b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs @@ -255,27 +255,35 @@ namespace FineUIPro.Web.CQMS.Solution } else if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile) { - Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId); - if (approve != null || CurrUser.UserId == Const.sysglyId) + var approve = CQMSConstructSolutionApproveService.GetThisApproveByConstructSolutionId(id); + if (approve!=null && approve.ApproveMan==this.CurrUser.UserId) { PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id))); - return; - //Response.Redirect("CQMSConstructSolutionAudit.aspx?constructSolutionId=" + id); - //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListView.aspx?CheckControlCode={0}", id, "查看 - "))); } else { - if (constructSolution.CompileMan.Equals(CurrUser.UserId)) - { - PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id))); - } - else - { - Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning); - return; - } - + Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning); + return; } + //Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId); + //if (approve != null || CurrUser.UserId == Const.sysglyId) + //{ + // PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id))); + // return; + //} + //else + //{ + // if (constructSolution.CompileMan.Equals(CurrUser.UserId)) + // { + // PageContext.RegisterStartupScript(window_tt.GetShowReference(String.Format("EditConstructSolution.aspx?constructSolutionId={0}", id))); + // } + // else + // { + // Alert.ShowInTop("您不是办理用户，无法操作！请右键查看", MessageBoxIcon.Warning); + // return; + // } + + //} } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs index 84841aba..8f5bbfbb 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Solution { - - - public partial class ConstructSolution { - +namespace FineUIPro.Web.CQMS.Solution +{ + + + public partial class ConstructSolution + { + /// /// 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; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpModelType 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpModelType; - + /// /// drpUnitWork 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWork; - + /// /// drpCNProfessional 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessional; - + /// /// btnDownLoad 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDownLoad; - + /// /// Toolbar2 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// drpProposeUnit 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpProposeUnit; - + /// /// drpSolutionType 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSolutionType; - + /// /// drpState 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpState; - + /// /// btnQuery 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnQuery; - + /// /// btnRset 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnRset; - + /// /// btnNew 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// lblPageIndex 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - + /// /// Label1 控件。 /// @@ -173,7 +175,16 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label2; + /// /// ToolbarSeparator1 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// window_tt 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window window_tt; - + /// /// Menu1 控件。 /// @@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuModify 控件。 /// @@ -236,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuModify; - + /// /// btnMenuView 控件。 /// @@ -245,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuView; - + /// /// btnMenuDel 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx index c1d7656b..c152f2d0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx @@ -138,15 +138,15 @@ - + <%-- + --%> @@ -156,7 +156,7 @@ - + --%> @@ -173,8 +173,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index d2988bd9..cda1dc55 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -53,22 +53,7 @@ namespace FineUIPro.Web.CQMS.Solution { if (!IsPostBack) { - var unitWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId); - var unitWorks = from x in unitWork - select - new - { - UnitWorkId = x.UnitWorkId, - UnitWorkName = x.UnitWorkCode + "-" + x.UnitWorkName + BLL.UnitWorkService.GetProjectType(x.ProjectType) - }; - gvUnitWork.DataSource = unitWorks; - gvUnitWork.DataBind(); - var gvCNProfessional = CNProfessionalService.GetList(); - gvCNPro.DataSource = gvCNProfessional; - gvCNPro.DataBind(); - BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false); - BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(drpSpecialType, false); - UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + InitDropDownList();//加载下拉框 BindZYRole(); BindZLRole(); BindAQRole(); @@ -81,6 +66,10 @@ namespace FineUIPro.Web.CQMS.Solution ConstructSolutionId = Request.Params["constructSolutionId"]; if (!string.IsNullOrWhiteSpace(ConstructSolutionId)) { + bindApprove(); + + #region 初始化表单 + HFConstructSolutionId.Text = ConstructSolutionId; Model.Solution_CQMSConstructSolution constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId); txtCode.Text = constructSolution.Code; @@ -123,38 +112,31 @@ namespace FineUIPro.Web.CQMS.Solution { txtEdition.Text = constructSolution.Edition.ToString(); } - bindApprove(); + + + + #endregion + + #region 检查树节点 var zyUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZY"); if (zyUserIds.Count > 0) { SetCheck(trOne, zyUserIds); } - var zlUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "ZL"); - if (zlUserIds.Count > 0) - { - SetCheck(trTwo, zlUserIds); - } var aqUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "AQ"); if (aqUserIds.Count > 0) { SetCheck(trThree, aqUserIds); } - var kzUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "KZ"); - if (kzUserIds.Count > 0) - { - SetCheck(trFour, kzUserIds); - } var sgUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "SG"); if (sgUserIds.Count > 0) { SetCheck(trFive, sgUserIds); } - var xmUserIds = CQMSConstructSolutionApproveService.GetUserIdsApprovesBySignType(ConstructSolutionId, "XM"); - if (xmUserIds.Count > 0) - { - SetCheck(trSixe, xmUserIds); - } + + #endregion + if (constructSolution.State == Const.CQMSConstructSolution_ReCompile) { agree.Hidden = true; @@ -219,6 +201,27 @@ namespace FineUIPro.Web.CQMS.Solution txtProjectName.Text = ProjectService.GetProjectByProjectId(CurrUser.LoginProjectId).ProjectName; } } + + private void InitDropDownList() + { + var unitWork = UnitWorkService.GetUnitWorkLists(CurrUser.LoginProjectId); + var unitWorks = from x in unitWork + select + new + { + UnitWorkId = x.UnitWorkId, + UnitWorkName = x.UnitWorkCode + "-" + x.UnitWorkName + BLL.UnitWorkService.GetProjectType(x.ProjectType) + }; + gvUnitWork.DataSource = unitWorks; + gvUnitWork.DataBind(); + var gvCNProfessional = CNProfessionalService.GetList(); + gvCNPro.DataSource = gvCNProfessional; + gvCNPro.DataBind(); + BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false); + BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(drpSpecialType, false); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); + } + /// /// 审批列表 /// @@ -256,6 +259,7 @@ namespace FineUIPro.Web.CQMS.Solution protected void btnSubmit_Click(object sender, EventArgs e) { validate(Const.BtnSubmit, "submmit"); + } /// @@ -283,11 +287,11 @@ namespace FineUIPro.Web.CQMS.Solution //} List list = new List(); list.Add(trOne); - list.Add(trTwo); + //list.Add(trTwo); list.Add(trThree); - list.Add(trFour); + // list.Add(trFour); list.Add(trFive); - list.Add(trSixe); + // list.Add(trSixe); var res = false; foreach (var item in list) { @@ -343,6 +347,7 @@ namespace FineUIPro.Web.CQMS.Solution else { tip = "提交成功!"; + CQMSConstructSolutionApproveService.PushMessageToNextMan(ConstructSolutionId); } Alert.ShowInTop(tip, MessageBoxIcon.Success); } @@ -519,12 +524,7 @@ namespace FineUIPro.Web.CQMS.Solution /// /// 保存类型 private void SaveCQMSConstructSolution(string saveType) - { - //if (tvHSE.CheckedNodes.Count == 0 || (tvHSE.CheckedNodes.Count > 0 && tvHSE.CheckedNodes[0].Value == "0")) - //{ - // ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('请选择HSE会签人员！')", true); - // return; - //} + { Model.Solution_CQMSConstructSolution constructSolution = new Model.Solution_CQMSConstructSolution(); constructSolution.Code = txtCode.Text.Trim(); constructSolution.ProjectId = CurrUser.LoginProjectId; @@ -618,13 +618,13 @@ namespace FineUIPro.Web.CQMS.Solution } - /// /// 会签 /// private void countersign(string constructSolutionId) { var solution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(ConstructSolutionId); + if (trOne.Nodes[0].Nodes.Count > 0) { foreach (TreeNode tn in trOne.Nodes[0].Nodes) @@ -644,7 +644,7 @@ namespace FineUIPro.Web.CQMS.Solution approve.Edition = edtion; delSolutionApprove(constructSolutionId, tn.NodeID, "ZY"); CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + // APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); } else { @@ -653,35 +653,6 @@ namespace FineUIPro.Web.CQMS.Solution } } - if (trTwo.Nodes[0].Nodes.Count > 0) - { - - foreach (TreeNode tn in trTwo.Nodes[0].Nodes) - { - if (tn.Checked) - { - Model.Solution_CQMSConstructSolutionApprove approve = new Model.Solution_CQMSConstructSolutionApprove(); - approve.ConstructSolutionId = constructSolutionId; - approve.ApproveMan = tn.NodeID; - approve.ApproveType = Const.CQMSConstructSolution_Audit; - approve.SignType = "ZL"; - int edtion = Convert.ToInt32(txtEdition.Text); - if (solution != null) - { - edtion++; - } - approve.Edition = edtion; - delSolutionApprove(constructSolutionId, tn.NodeID, "ZL"); - CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); - } - else - { - delSolutionApprove(constructSolutionId, tn.NodeID, "ZL"); - } - - } - } if (trThree.Nodes[0].Nodes.Count > 0) { @@ -702,7 +673,7 @@ namespace FineUIPro.Web.CQMS.Solution approve.Edition = edtion; delSolutionApprove(constructSolutionId, tn.NodeID, "AQ"); CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + //APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); } else { @@ -711,36 +682,6 @@ namespace FineUIPro.Web.CQMS.Solution } } - if (trFour.Nodes[0].Nodes.Count > 0) - { - - foreach (TreeNode tn in trFour.Nodes[0].Nodes) - { - if (tn.Checked) - { - Model.Solution_CQMSConstructSolutionApprove approve = new Model.Solution_CQMSConstructSolutionApprove(); - approve.ConstructSolutionId = constructSolutionId; - approve.ApproveMan = tn.NodeID; - approve.ApproveType = Const.CQMSConstructSolution_Audit; - approve.SignType = "KZ"; - int edtion = Convert.ToInt32(txtEdition.Text); - if (solution != null) - { - edtion++; - } - approve.Edition = edtion; - delSolutionApprove(constructSolutionId, tn.NodeID, "KZ"); - CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); - - } - else - { - delSolutionApprove(constructSolutionId, tn.NodeID, "KZ"); - } - - } - } if (trFive.Nodes[0].Nodes.Count > 0) { @@ -761,7 +702,7 @@ namespace FineUIPro.Web.CQMS.Solution approve.Edition = edtion; delSolutionApprove(constructSolutionId, tn.NodeID, "SG"); CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + // APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); } else { @@ -769,34 +710,6 @@ namespace FineUIPro.Web.CQMS.Solution } } } - if (trSixe.Nodes[0].Nodes.Count > 0) - { - - foreach (TreeNode tn in trSixe.Nodes[0].Nodes) - { - if (tn.Checked) - { - Model.Solution_CQMSConstructSolutionApprove approve = new Model.Solution_CQMSConstructSolutionApprove(); - approve.ConstructSolutionId = constructSolutionId; - approve.ApproveMan = tn.NodeID; - approve.ApproveType = Const.CQMSConstructSolution_Audit; - approve.SignType = "XM"; - int edtion = Convert.ToInt32(txtEdition.Text); - if (solution != null) - { - edtion++; - } - approve.Edition = edtion; - delSolutionApprove(constructSolutionId, tn.NodeID, "XM"); - CQMSConstructSolutionApproveService.AddConstructSolutionApprove(approve); - APICommonService.SendSubscribeMessage(approve.ApproveMan, "施工方案待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); - } - else - { - delSolutionApprove(constructSolutionId, tn.NodeID, "XM"); - } - } - } } #region 动态加载角色树 @@ -853,7 +766,7 @@ namespace FineUIPro.Web.CQMS.Solution } private void BindZLRole() { - TreeNode rootNode = new TreeNode();//定义根节点 + /*TreeNode rootNode = new TreeNode();//定义根节点 rootNode.Text = "质量组"; rootNode.NodeID = "0"; rootNode.Expanded = true; @@ -878,7 +791,7 @@ namespace FineUIPro.Web.CQMS.Solution roleNode.NodeID = u.UserId; rootNode.Nodes.Add(roleNode); } - } + }*/ } /// /// 判断是否有选择 @@ -934,7 +847,7 @@ namespace FineUIPro.Web.CQMS.Solution private void BindKZRole() { - TreeNode rootNode = new TreeNode();//定义根节点 + /*TreeNode rootNode = new TreeNode();//定义根节点 rootNode.Text = "控制组"; rootNode.NodeID = "0"; rootNode.Expanded = true; @@ -959,7 +872,7 @@ namespace FineUIPro.Web.CQMS.Solution roleNode.NodeID = u.UserId; rootNode.Nodes.Add(roleNode); } - } + }*/ } private void BindSGRole() @@ -996,7 +909,7 @@ namespace FineUIPro.Web.CQMS.Solution private void BindXMRole() { - TreeNode rootNode = new TreeNode();//定义根节点 + /*TreeNode rootNode = new TreeNode();//定义根节点 rootNode.Text = "项目经理"; rootNode.NodeID = "0"; rootNode.Expanded = true; @@ -1021,7 +934,7 @@ namespace FineUIPro.Web.CQMS.Solution roleNode.NodeID = u.UserId; rootNode.Nodes.Add(roleNode); } - } + }*/ } #endregion @@ -1040,14 +953,14 @@ namespace FineUIPro.Web.CQMS.Solution protected void trTwo_NodeCheck(object sender, TreeCheckEventArgs e) { - if (e.Checked) + /*if (e.Checked) { trTwo.CheckAllNodes(e.Node.Nodes); } else { trTwo.UncheckAllNodes(e.Node.Nodes); - } + }*/ } protected void trThree_NodeCheck(object sender, TreeCheckEventArgs e) @@ -1064,14 +977,14 @@ namespace FineUIPro.Web.CQMS.Solution protected void trFour_NodeCheck(object sender, TreeCheckEventArgs e) { - if (e.Checked) + /*if (e.Checked) { trFour.CheckAllNodes(e.Node.Nodes); } else { trFour.UncheckAllNodes(e.Node.Nodes); - } + }*/ } protected void trFive_NodeCheck(object sender, TreeCheckEventArgs e) @@ -1089,14 +1002,14 @@ namespace FineUIPro.Web.CQMS.Solution protected void trSixe_NodeCheck(object sender, TreeCheckEventArgs e) { - if (e.Checked) + /*if (e.Checked) { trSixe.CheckAllNodes(e.Node.Nodes); } else { trSixe.UncheckAllNodes(e.Node.Nodes); - } + }*/ } @@ -1108,46 +1021,11 @@ namespace FineUIPro.Web.CQMS.Solution { HFConstructSolutionId.Text = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolution)); } - string id = HFConstructSolutionId.Text; - Model.Solution_CQMSConstructSolution constructSolution = CQMSConstructSolutionService.GetConstructSolutionByConstructSolutionId(id); - if (constructSolution != null) - { - if (constructSolution.State == Const.CQMSConstructSolution_Audit || constructSolution.State == Const.CQMSConstructSolution_ReCompile) - { - Model.Solution_CQMSConstructSolutionApprove approve = CQMSConstructSolutionApproveService.GetConstructSolutionApproveByApproveMan(id, CurrUser.UserId); - if (approve != null || CurrUser.UserId == Const.sysglyId) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference( - String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}", - ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))); - } - else - { - if (!constructSolution.CompileMan.Equals(CurrUser.UserId)) - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference( - String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}&&editorMode={3}", - ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId, "view"))); - } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference( + String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}", + ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))); - } - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference( - String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}", - ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))); - } - } - else - { - PageContext.RegisterStartupScript(WindowAtt.GetShowReference( - String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}", - ContactImg, HFConstructSolutionId.Text, Const.CQMSConstructSolutionMenuId))); - } - - } protected void btnapprove_Click(object sender, EventArgs e) diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs index e2f870dc..b070af7f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs @@ -203,24 +203,6 @@ namespace FineUIPro.Web.CQMS.Solution /// protected global::FineUIPro.Tree trOne; - /// - /// Panel3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel3; - - /// - /// trTwo 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Tree trTwo; - /// /// Panel4 控件。 /// @@ -239,24 +221,6 @@ namespace FineUIPro.Web.CQMS.Solution /// protected global::FineUIPro.Tree trThree; - /// - /// Panel5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel5; - - /// - /// trFour 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Tree trFour; - /// /// Panel6 控件。 /// @@ -275,24 +239,6 @@ namespace FineUIPro.Web.CQMS.Solution /// protected global::FineUIPro.Tree trFive; - /// - /// Panel7 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Panel Panel7; - - /// - /// trSixe 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Tree trSixe; - /// /// agree 控件。 /// diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx index be853495..c9063f06 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx @@ -156,7 +156,7 @@ + BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Height="500px"> @@ -177,14 +177,9 @@ - - - - - - + diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs index c55ac094..62c0c7e2 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs @@ -58,6 +58,7 @@ namespace FineUIPro.Web.DocManage //CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); Options.Hidden = true; rblIsAgree.Visible = false; + next.Hidden = true; DocId = Request.Params["DocId"]; BindForm(); InitCopyMan(); diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index 80a2106b..eb063ef6 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.common select x; var glAllPerson = from x in allSum join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId - where (y.PostType == "1" || y.PostType == "4") && x.ProjectId == ProjectId //一般管理岗位和特种管理人员 + where y.IsHsse==true && x.ProjectId == ProjectId //安管人员 select x; this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString(); @@ -659,6 +659,7 @@ namespace FineUIPro.Web.common .ToList(); foreach (var item in result) { + index++; swgclHtml += "
"; swgclHtml += string.Format("

{0}

",index); swgclHtml += string.Format("

{0}

",item.Name); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 834d18e0..9ba1b64e 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -59639,6 +59639,8 @@ namespace Model private string _CheckItemSetId; + private string _ReceiveMan; + private string _ResponsibleUnit; private string _WorkAreaId; @@ -59647,8 +59649,6 @@ namespace Model private string _ResponsibleMan; - private string _ReceiveMan; - private EntityRef _Base_Project; private EntityRef _Technique_CheckItemSet; @@ -59689,6 +59689,8 @@ namespace Model partial void OnPartInPersonNamesChanged(); partial void OnCheckItemSetIdChanging(string value); partial void OnCheckItemSetIdChanged(); + partial void OnReceiveManChanging(string value); + partial void OnReceiveManChanged(); partial void OnResponsibleUnitChanging(string value); partial void OnResponsibleUnitChanged(); partial void OnWorkAreaIdChanging(string value); @@ -59697,8 +59699,6 @@ namespace Model partial void OnQuestionTypeChanged(); partial void OnResponsibleManChanging(string value); partial void OnResponsibleManChanged(); - partial void OnReceiveManChanging(string value); - partial void OnReceiveManChanged(); #endregion public Check_CheckSpecial() @@ -60036,6 +60036,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")] + public string ReceiveMan + { + get + { + return this._ReceiveMan; + } + set + { + if ((this._ReceiveMan != value)) + { + this.OnReceiveManChanging(value); + this.SendPropertyChanging(); + this._ReceiveMan = value; + this.SendPropertyChanged("ReceiveMan"); + this.OnReceiveManChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")] public string ResponsibleUnit { @@ -60116,26 +60136,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")] - public string ReceiveMan - { - get - { - return this._ReceiveMan; - } - set - { - if ((this._ReceiveMan != value)) - { - this.OnReceiveManChanging(value); - this.SendPropertyChanging(); - this._ReceiveMan = value; - this.SendPropertyChanged("ReceiveMan"); - this.OnReceiveManChanged(); - } - } - } - [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -316687,6 +316687,8 @@ namespace Model private System.Nullable _Edition; + private System.Nullable _Order; + private EntityRef _Solution_CQMSConstructSolution; private EntityRef _Sys_User; @@ -316715,6 +316717,8 @@ namespace Model partial void OnSignTypeChanged(); partial void OnEditionChanging(System.Nullable value); partial void OnEditionChanged(); + partial void OnOrderChanging(System.Nullable value); + partial void OnOrderChanged(); #endregion public Solution_CQMSConstructSolutionApprove() @@ -316932,6 +316936,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="order", Storage="_Order", DbType="Int")] + public System.Nullable Order + { + get + { + return this._Order; + } + set + { + if ((this._Order != value)) + { + this.OnOrderChanging(value); + this.SendPropertyChanging(); + this._Order = value; + this.SendPropertyChanged("Order"); + this.OnOrderChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_CQMSConstructSolutionApprove_Solution_CQMSConstructSolution", Storage="_Solution_CQMSConstructSolution", ThisKey="ConstructSolutionId", OtherKey="ConstructSolutionId", IsForeignKey=true)] public Solution_CQMSConstructSolution Solution_CQMSConstructSolution {