lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-10-19

This commit is contained in:
李鹏飞 2023-10-19 21:44:34 +08:00
parent c90f8f4cba
commit 3f9510cede
13 changed files with 250 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_CWCEC/v17/.wsuo
View File

Binary file not shown.

55
SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
View File

@ -63,6 +63,7 @@ namespace BLL
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.Edition = approve.Edition;
newApprove.Order=approve.Order;
db.SubmitChanges();
}
/// <summary>
@ -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;
}
/// <summary>
/// 获取当前办理人
/// </summary>
/// <param name="constructSolutionId"></param>
/// <returns></returns>
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;
}
/// <summary>
/// 推送待办给下一步办理人
/// </summary>
/// <param name="constructSolutionId"></param>
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();
}

9
SGGL/BLL/SysManage/UserService.cs
View File

@ -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;

7
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
View File

@ -154,7 +154,12 @@
<asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="State" Width="60px" HeaderText="当前审批人" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("State")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

38
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs
View File

@ -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;
// }
//}
}

73
SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Solution {
public partial class ConstructSolution {
namespace FineUIPro.Web.CQMS.Solution
{
public partial class ConstructSolution
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpModelType 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpModelType;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
/// <summary>
/// drpCNProfessional 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessional;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProposeUnit 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProposeUnit;
/// <summary>
/// drpSolutionType 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpSolutionType;
/// <summary>
/// drpState 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpState;
/// <summary>
/// btnQuery 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnRset 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnRset;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// Label1 控件。
/// </summary>
@ -173,7 +175,16 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -182,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -191,7 +202,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -200,7 +211,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -209,7 +220,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// window_tt 控件。
/// </summary>
@ -218,7 +229,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window window_tt;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -227,7 +238,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
@ -236,7 +247,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuView 控件。
/// </summary>
@ -245,7 +256,7 @@ namespace FineUIPro.Web.CQMS.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuView;
/// <summary>
/// btnMenuDel 控件。
/// </summary>

16
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx
View File

@ -138,15 +138,15 @@
</f:Tree>
</Items>
</f:Panel>
<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<%--<f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false" Hidden="True">
<Items>
<f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false" OnNodeCheck="trTwo_NodeCheck">
<Nodes>
</Nodes>
</f:Tree>
</Items>
</f:Panel>
</f:Panel>--%>
<f:Panel ID="Panel4" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
@ -156,7 +156,7 @@
</f:Tree>
</Items>
</f:Panel>
<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
<%--<f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false" OnNodeCheck="trFour_NodeCheck">
@ -164,7 +164,7 @@
</Nodes>
</f:Tree>
</Items>
</f:Panel>
</f:Panel>--%>
<f:Panel ID="Panel6" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
@ -173,8 +173,8 @@
</Nodes>
</f:Tree>
</Items>
</f:Panel>
<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px"
</f:Panel>
<%--<f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Height="200px" Hidden="True"
TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
<Items>
<f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false" OnNodeCheck="trSixe_NodeCheck">
@ -182,7 +182,7 @@
</Nodes>
</f:Tree>
</Items>
</f:Panel>
</f:Panel>--%>
</Items>
</f:Panel>
</Items>

242
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs
View File

@ -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);
}
/// <summary>
/// 审批列表
/// </summary>
@ -256,6 +259,7 @@ namespace FineUIPro.Web.CQMS.Solution
protected void btnSubmit_Click(object sender, EventArgs e)
{
validate(Const.BtnSubmit, "submmit");
}
/// <summary>
@ -283,11 +287,11 @@ namespace FineUIPro.Web.CQMS.Solution
//}
List<FineUIPro.Tree> list = new List<FineUIPro.Tree>();
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
/// </summary>
/// <param name="saveType">保存类型</param>
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
}
/// <summary>
/// 会签
/// </summary>
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);
}
}
}*/
}
/// <summary>
/// 判断是否有选择
@ -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)

54
SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.designer.cs generated
View File

@ -203,24 +203,6 @@ namespace FineUIPro.Web.CQMS.Solution
/// </remarks>
protected global::FineUIPro.Tree trOne;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// trTwo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trTwo;
/// <summary>
/// Panel4 控件。
/// </summary>
@ -239,24 +221,6 @@ namespace FineUIPro.Web.CQMS.Solution
/// </remarks>
protected global::FineUIPro.Tree trThree;
/// <summary>
/// Panel5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel5;
/// <summary>
/// trFour 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trFour;
/// <summary>
/// Panel6 控件。
/// </summary>
@ -275,24 +239,6 @@ namespace FineUIPro.Web.CQMS.Solution
/// </remarks>
protected global::FineUIPro.Tree trFive;
/// <summary>
/// Panel7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel7;
/// <summary>
/// trSixe 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree trSixe;
/// <summary>
/// agree 控件。
/// </summary>

9
SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx
View File

@ -156,7 +156,7 @@
<f:ContentPanel ID="ContentPanel1" Title="文档审批流程设置" runat="server" ShowHeader="true" EnableCollapse="true"
BodyPadding="0px">
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true" IsFluid="True"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Height="500px">
<Rows>
<f:FormRow>
<Items>
@ -177,14 +177,9 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel runat="server" BodyPadding="5px" ShowHeader="False" ShowBorder="False">
<f:ContentPanel runat="server" BodyPadding="5px" ShowHeader="False" ShowBorder="False" AutoScroll="True">
<Items>
<f:TextBox runat="server" ID="txtCopyMan" Label="抄送人员" Readonly="True" Enabled="False"/>

1
SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs
View File

@ -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();

3
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -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 += "<div class=\"tr1\">";
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: .625rem;\"><p>{0}</p></div>",index);
swgclHtml += string.Format("<div class=\"th r-line\" style=\"width: 1rem;\"><p>{0}</p> </div>",item.Name);

72
SGGL/Model/Model.cs
View File

@ -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> _Base_Project;
private EntityRef<Technique_CheckItemSet> _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<int> _Edition;
private System.Nullable<int> _Order;
private EntityRef<Solution_CQMSConstructSolution> _Solution_CQMSConstructSolution;
private EntityRef<Sys_User> _Sys_User;
@ -316715,6 +316717,8 @@ namespace Model
partial void OnSignTypeChanged();
partial void OnEditionChanging(System.Nullable<int> value);
partial void OnEditionChanged();
partial void OnOrderChanging(System.Nullable<int> 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<int> 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
{