lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改质量巡检流程

This commit is contained in:
高飞 2023-03-08 10:17:16 +08:00
parent f3ad764dc8
commit a3c6b69133
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
SGGL/BLL/CQMS/Check/CheckControlService.cs
View File

@ -142,9 +142,9 @@ namespace BLL
{ {
if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile) //无是否同意 if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile) //无是否同意
{ {
ListItem[] lis = new ListItem[2]; ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1); //lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2); lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
return lis; return lis;
} }
else if (state == Const.CheckControl_Audit1)//有是否同意 else if (state == Const.CheckControl_Audit1)//有是否同意
@ -156,9 +156,9 @@ namespace BLL
} }
else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意 else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
{ {
ListItem[] lis = new ListItem[2]; ListItem[] lis = new ListItem[1];
lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3); //lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4); lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
return lis; return lis;
} }
else if (state == Const.CheckControl_Audit3)//有是否同意 else if (state == Const.CheckControl_Audit3)//有是否同意
@ -170,10 +170,10 @@ namespace BLL
} }
else if (state == Const.CheckControl_Audit4)//有是否同意 else if (state == Const.CheckControl_Audit4)//有是否同意
{ {
ListItem[] lis = new ListItem[3]; ListItem[] lis = new ListItem[2];
lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载 //lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载 lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载 lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
return lis; return lis;
} }
else if (state == Const.CheckControl_Audit5)//有是否同意 else if (state == Const.CheckControl_Audit5)//有是否同意

2
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
View File

@ -45,7 +45,7 @@
<f:FormRow> <f:FormRow>
<Items> <Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right" <f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
MaxLength="50"> >
</f:TextBox> </f:TextBox>
<f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right" <f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50"> MaxLength="50">

6
SGGL/FineUIPro.Web/CQMS/PersonManage/WelderManage.aspx.cs
View File

@ -192,6 +192,10 @@ namespace FineUIPro.Web.CQMS.PersonManage
rootNode.EnableClickEvent = true; rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode); this.tvControlItem.Nodes.Add(rootNode);
var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList(); var getWelders = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Welder && x.States == Const.ProjectPersonStates_1 && x.UnitId == item.UnitId && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
if (!string.IsNullOrEmpty(txtQueryWelderCode.Text.Trim()))
{
getWelders = getWelders.Where(x => x.WelderCode.Contains(txtQueryWelderCode.Text.Trim())).ToList();
}
foreach (var sitem in getWelders) foreach (var sitem in getWelders)
{ {
TreeNode tn = new TreeNode(); TreeNode tn = new TreeNode();
@ -202,7 +206,7 @@ namespace FineUIPro.Web.CQMS.PersonManage
} }
else else
{ {
tn.Text = sitem.PersonName+"【" + sitem.WelderCode + "】"; tn.Text = sitem.PersonName + "【" + sitem.WelderCode + "】";
} }
tn.EnableClickEvent = true; tn.EnableClickEvent = true;
rootNode.Nodes.Add(tn); rootNode.Nodes.Add(tn);