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

20240606 修改组织机构图

Browse Source
This commit is contained in:
毕文静
2024-06-06 15:48:52 +08:00
parent 0c28c16c1d
commit 35c2b0350e
16 changed files with 465 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs
+1 -1
View File
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
BP.Class,
P.AcceptanceSite,
P.AcceptanceCheckMan,
(CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified,
(CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified,
P.InspectionCode,
P.InspectionDate"
+ @" FROM ProcessControl_InspectionManagement AS P "
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx
+5 -2
View File
@@ -29,7 +29,10 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtAcceptanceSite" Label="验收部位" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtAcceptanceCheckMan" Label="检查人" LabelAlign="Right" LabelWidth="130px"></f:TextBox>--%>
<f:DropDownList ID="drpAcceptanceCheckMan" runat="server" Label="检查人" EnableCheckBoxSelect="true" LabelWidth="130px"
EnableMultiSelect="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -38,7 +41,7 @@
<f:RadioItem Value="True" Text="是" Selected="true" />
<f:RadioItem Value="False" Text="否" />
</f:RadioButtonList>
<f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px"></f:DatePicker>
<f:DatePicker ID="txtInspectionDate" runat="server" DateFormatString="yyyy-MM-dd HH:mm:ss" ShowTime="true" Label="验收日期" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs
+23 -7
View File
@@ -19,6 +19,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
GetButtonPower();
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业
UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false);
this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text))
@@ -35,7 +36,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId;
}
this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite;
this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan;
//this.txtAcceptanceCheckMan.Text = ConvertCheckMan(inspectionManagement.AcceptanceCheckMan);
if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan))
{
this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(',');
}
this.txtNoticeCode.Text = inspectionManagement.NoticeCode;
this.hdParentDivisionProjectId.Text = inspectionManagement.ParentDivisionProjectId;
if (inspectionManagement.IsOnceQualified.HasValue)
@@ -100,18 +105,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl
}
inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim();
inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
//检查人
string CheckManIds = string.Empty;
foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray)
{
CheckManIds += item + ",";
}
if (!string.IsNullOrEmpty(CheckManIds))
{
CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(","));
}
inspectionManagement.AcceptanceCheckMan = CheckManIds;
//inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
if (!string.IsNullOrEmpty(this.rblIsOnceQualified.SelectedValue))
{
if (this.rblIsOnceQualified.SelectedValue == "True")
{
inspectionManagement.IsOnceQualified = true;
}
else
if (this.rblIsOnceQualified.SelectedValue == "False")
{
inspectionManagement.IsOnceQualified = false;
inspectionManagement.UnqualifiedReason = this.txtUnqualifiedReason.Text.Trim();
}
else
{
inspectionManagement.IsOnceQualified = true;
}
}
inspectionManagement.InspectionCode = this.txtInspectionCode.Text.Trim();
inspectionManagement.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text.Trim());
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs
Generated
+2 -2
View File
@@ -85,13 +85,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl {
protected global::FineUIPro.TextBox txtAcceptanceSite;
/// <summary>
/// txtAcceptanceCheckMan 控件。
/// drpAcceptanceCheckMan 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAcceptanceCheckMan;
protected global::FineUIPro.DropDownList drpAcceptanceCheckMan;
/// <summary>
/// rblIsOnceQualified 控件。