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

fix:人员必填

This commit is contained in:
geh 2025-03-31 16:05:25 +08:00
parent 4abca1fa1c
commit 4872ac5231
5 changed files with 29 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/CQMS/Check/CheckControlApproveService.cs
View File

@ -101,7 +101,7 @@ namespace BLL
/// <returns>一个质量巡检审批实体</returns>
public static Model.Check_CheckControlApprove GetCheckControlApproveByCheckControlId(string CheckControlCode)
{
return db.Check_CheckControlApprove.OrderByDescending(x=>x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate != null);
return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate == null);
}
/// <summary>
/// 修改质量巡检审批信息

2
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
View File

@ -377,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Check
}
}
else if (isAuthenticated)
else if (isAuthenticated || CurrUser.UserId == Const.hfnbdId)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListEdit.aspx?CheckControlCode={0}", codes, "编辑 - ")));
return;

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

@ -186,10 +186,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="true" runat="server" Label="下一步" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleType" ShowRedStar="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" Label="下一步" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="True" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpHandleMan" ShowRedStar="true" runat="server" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleMan" ShowRedStar="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>

83
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.cs
View File

@ -197,20 +197,17 @@ namespace FineUIPro.Web.CQMS.Check
}
if (State != BLL.Const.CheckControl_Complete)
{
//Funs.Bind(drpHandleType, CheckControlService.GetDHandleTypeByState(State));
CheckControlService.Init(drpHandleType, State, false);
}
if (State == BLL.Const.CheckControl_Compile)
{
this.rblIsAgree.Visible = false;
//Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId))
UserService.Init(drpHandleMan, CurrUser.LoginProjectId, false);
this.drpHandleMan.SelectedIndex = 1;
}
else
{
UserService.Init(drpHandleMan, CurrUser.LoginProjectId, false);
//Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId));
this.rblIsAgree.Visible = true;
}
@ -371,7 +368,15 @@ namespace FineUIPro.Web.CQMS.Check
}
}
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete && (this.drpHandleMan.SelectedValue == "0" || this.drpHandleMan.SelectedValue == null))
if (string.IsNullOrEmpty(drpHandleType.SelectedValue))
{
Alert.ShowInTop("请先选择下一步流程！", MessageBoxIcon.Warning);
return;
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete &&
string.IsNullOrEmpty(drpHandleMan.SelectedValue))
{
Alert.ShowInTop("请先选择办理人员！", MessageBoxIcon.Warning);
return;
@ -425,7 +430,14 @@ namespace FineUIPro.Web.CQMS.Check
}
}
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete && (this.drpHandleMan.SelectedValue == "0" || this.drpHandleMan.SelectedValue == null))
if (string.IsNullOrEmpty(drpHandleType.SelectedValue))
{
Alert.ShowInTop("请先选择下一步流程！", MessageBoxIcon.Warning);
return;
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete &&
string.IsNullOrEmpty(drpHandleMan.SelectedValue))
{
Alert.ShowInTop("请先选择办理人员！", MessageBoxIcon.Warning);
return;
@ -640,10 +652,10 @@ namespace FineUIPro.Web.CQMS.Check
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty);
}
if (drpHandleMan.Items.Count > 0)
{
drpHandleMan.SelectedIndex = 0;
}
// if (drpHandleMan.Items.Count > 0)
// {
// drpHandleMan.SelectedIndex = 0;
// }
if (drpHandleType.SelectedText.Contains("重新编制"))
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty);
@ -672,16 +684,6 @@ namespace FineUIPro.Web.CQMS.Check
protected void drpHandleType_SelectedIndexChanged(object sender, EventArgs e)
{
HandleMan();
//if (drpHandleType.SelectedValue == BLL.Const.CheckControl_Audit2 || drpHandleType.SelectedValue == BLL.Const.CheckControl_ReCompile2)
//{
// drpHandleMan.Items.Clear();
//Funs.Bind(drpHandleMan, UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, drpUnit.SelectedValue));
//}
//else
//{
// drpHandleMan.Items.Clear();
// Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId));
//}
}
protected void rblIsAgree_SelectedIndexChanged(object sender, EventArgs e)
@ -693,49 +695,6 @@ namespace FineUIPro.Web.CQMS.Check
{
}
//if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile) //无是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
// lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
// return lis;
//}
//else if (state == Const.CheckControl_Audit1)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);//是 加载
// lis[1] = new ListItem("重新整理", Const.CheckControl_ReCompile);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
// lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
// return lis;
//}
//else if (state == Const.CheckControl_Audit3)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);//是 加载
// lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit4)//有是否同意
//{
// ListItem[] lis = new ListItem[3];
// lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
// lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
// lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit5)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
// lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
/// <summary>
/// 待办事项的下拉框的处理

6
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -682,11 +682,11 @@
</div>
<input type="hidden" id="hiddenUrl" value="" runat="server" />
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnshowWindows" ToolTip="打开代办" Hidden="true"
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnshowWindows" ToolTip="打开待办" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnShowWindows">
</f:Button>
<f:Window ID="Window1" Title="代办" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="待办" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="660px">
</f:Window>
@ -787,7 +787,7 @@
function reloadGrid(param) {
__doPostBack(null, 'ReloadGrid$' + param);
}
//弹框代办
//弹框待办
function returnWindows(objUrl) {
document.getElementById("hiddenUrl").value = objUrl;
$('#btnShowWindows').click();