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

2、五环，预试车管理，生成工作包检查表和检查表会签逻辑优化；

Browse Source 
3、五环，项目级补充待办
This commit is contained in:
夏菊
2025-01-08 14:51:16 +08:00
parent f7396815a0
commit f002af50a7
17 changed files with 732 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
+11 -3
View File
@@ -51,8 +51,16 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="检查事项" ColumnID="WorkInspectName" DataField="WorkInspectName" SortField="WorkInspectName" Width="400px"></f:RenderField>
<f:RenderField HeaderText="检查说明" ColumnID="InspectionIllustrate" DataField="InspectionIllustrate" Width="200px"></f:RenderField>
<f:TemplateField Width="200px" HeaderText="签字确认" ColumnID="IsPass">
<f:RenderField HeaderText="检查人" ColumnID="InspectedUserName" DataField="InspectedUserName" Width="100px"></f:RenderField>
<f:TemplateField Width="100px" HeaderText="检查结果">
<ItemTemplate>
<asp:Label ID="lblInspectionResults" runat="server" Text='<%# Results(Eval("InspectionResults")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="检查说明" ColumnID="InspectionIllustrate" DataField="InspectionIllustrate" Width="200px"></f:RenderField>
<f:TemplateField Width="200px" HeaderText="会签确认" ColumnID="IsPass">
<ItemTemplate>
<asp:RadioButtonList runat="server" RepeatLayout="Flow" CssClass="ispass" RepeatDirection="Horizontal" ID="rblIsPass" AutoPostBack="true" OnSelectedIndexChanged="rblIsPass_SelectedIndexChanged">
<asp:ListItem Text="通过" Value="1" Selected="True"></asp:ListItem>
@@ -61,7 +69,7 @@
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="300px">
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="200px">
<Editor>
<f:TextBox runat="server" ID="txtRemark"></f:TextBox>
</Editor>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs
+57 -3
View File
@@ -78,7 +78,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void BindGrid(int isPass = -1)
{
var term = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
var db = Funs.DB;
var term = db.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
if (term != null)
{
lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "是" : "否";
@@ -87,8 +88,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
//获取子系统
var data = new List<ConfirmIsPass>();
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList();
if (list.Count > 0)
//var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList();
var list = (from x in db.PreRun_SubInspectTermItem
join y in db.Sys_User on x.InspectedUser equals y.UserId
where x.SubInspectId == this.SubInspectId
select new
{
x.TermItemId,
x.SubItemId,
x.SubInspectId,
x.WorkInspectName,
x.InspectionResults,
x.InspectionIllustrate,
x.SubcontractorIsPass,
x.SubcontractorRemark,
x.ContractorIsPass,
x.ContractorRemark,
x.SupervisionIsPass,
x.SupervisionRemark,
x.OwnerIsPass,
x.OwnerRemark,
x.Sort,
InspectedUserName = y.UserName
}
).OrderBy(z => z.Sort).ToList();
if (list.Count() > 0)
{
foreach (var item in list)
{
@@ -97,6 +122,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
model.SubItemId = item.SubItemId;
model.SubInspectId = item.SubInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InspectedUserName = item.InspectedUserName;
model.InspectionResults = item.InspectionResults;
model.ConfirmType = this.ConfirmType;
model.InspectionIllustrate = item.InspectionIllustrate;
model.ConfirmTypeName = this.ConfirmTypeName;
@@ -127,6 +154,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Grid1.DataSource = data;
Grid1.DataBind();
titleName.Title = this.ConfirmType == 1 ? "分包商确认签字" : this.ConfirmType == 2 ? "承包商确认签字" : this.ConfirmType == 3 ? "监理确认签字" : this.ConfirmType == 4 ? "业主确认签字" : "";
}
/// <summary>
@@ -139,6 +167,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
BindGrid();
}
/// <summary>
/// 检测结果
/// </summary>
/// <returns></returns>
public string Results(object value)
{
var result = string.Empty;
if (value != null)
{
var intVal = int.Parse(value.ToString());
if (intVal == 1)
{
result = "通过";
}
else if (intVal == 0)
{
result = "未通过";
}
}
return result;
}
#endregion
#region 按钮和事件
@@ -765,6 +816,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 确认类型名称
/// </summary>
public string ConfirmTypeName { get; set; }
public string InspectedUserName { get; set; }
public int? InspectionResults { get; set; }
/// <summary>
/// 是否通过
/// </summary>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs
Generated
+9
View File
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// lblInspectionResults 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblInspectionResults;
/// <summary>
/// rblIsPass 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx
+26 -1
View File
@@ -10,10 +10,26 @@
white-space: normal;
word-break: break-all;
}
.customlabel span {
color: red;
font-weight: bold;
}
.unconfirm span {
color: gray;
font-weight: bold;
}
.notpass span {
color: red;
font-weight: bold;
}
.pass span {
color: green;
font-weight: bold;
}
</style>
</head>
<body>
@@ -107,15 +123,24 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Bottom" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlfbs" Required="true" EnableEdit="true" Label="施工分包商" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labSubcontractor" Hidden="true"></f:Label>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlcbs" Required="true" EnableEdit="true" Label="承包商" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labContractor" Hidden="true"></f:Label>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar4" Position="Bottom" runat="server">
<Items>
<f:DropDownList ID="ddljl" Required="true" EnableEdit="true" Label="监理" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labSupervision" Hidden="true"></f:Label>
<f:ToolbarFill ID="ToolbarFill2" runat="server"></f:ToolbarFill>
<f:DropDownList ID="ddlyz" Required="true" EnableEdit="true" Label="业主" LabelAlign="Right" AutoSelectFirstItem="false" LabelWidth="120px" runat="server">
</f:DropDownList>
<f:Label runat="server" ID="labOwner" Hidden="true"></f:Label>
</Items>
</f:Toolbar>
</Toolbars>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
+35
View File
@@ -261,6 +261,41 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlcbs.SelectedValue = subModel.Contractor;
ddljl.SelectedValue = subModel.Supervision;
ddlyz.SelectedValue = subModel.Owner;
labSubcontractor.Hidden = false;
labSubcontractor.Text = subModel.SubcontractorIsAllPass == null ? "（待确认）" : subModel.SubcontractorIsAllPass == 0 ? "（不通过）" : subModel.SubcontractorIsAllPass == 1 ? "（通过）" : "（待确认）";
labSubcontractor.CssClass = subModel.SubcontractorIsAllPass == null ? "unconfirm" : subModel.SubcontractorIsAllPass == 0 ? "notpass" : subModel.SubcontractorIsAllPass == 1 ? "pass" : "unconfirm";
labContractor.Hidden = false;
labContractor.Text = subModel.ContractorIsAllPass == null ? "（待确认）" : subModel.ContractorIsAllPass == 0 ? "（不通过）" : subModel.ContractorIsAllPass == 1 ? "（通过）" : "（待确认）";
labContractor.CssClass = subModel.ContractorIsAllPass == null ? "unconfirm" : subModel.ContractorIsAllPass == 0 ? "notpass" : subModel.ContractorIsAllPass == 1 ? "pass" : "unconfirm";
labSupervision.Hidden = false;
labSupervision.Text = subModel.SupervisionIsAllPass == null ? "（待确认）" : subModel.SupervisionIsAllPass == 0 ? "（不通过）" : subModel.SupervisionIsAllPass == 1 ? "（通过）" : "（待确认）";
labSupervision.CssClass = subModel.SupervisionIsAllPass == null ? "unconfirm" : subModel.SupervisionIsAllPass == 0 ? "notpass" : subModel.SupervisionIsAllPass == 1 ? "pass" : "unconfirm";
labOwner.Hidden = false;
labOwner.Text = subModel.OwnerIsAllPass == null ? "（待确认）" : subModel.OwnerIsAllPass == 0 ? "（不通过）" : subModel.OwnerIsAllPass == 1 ? "（通过）" : "（待确认）";
labOwner.CssClass = subModel.OwnerIsAllPass == null ? "unconfirm" : subModel.OwnerIsAllPass == 0 ? "notpass" : subModel.OwnerIsAllPass == 1 ? "pass" : "unconfirm";
//if (subModel.SubcontractorIsAllPass == null)
//{
// labSupervision.Text = "（待确认）";
// labSupervision.CssClass = "unconfirm";
//}
//else if (subModel.SubcontractorIsAllPass == 0)
//{
// labSupervision.Text = "（通过）";
// labSupervision.CssClass = "notpass";
//}
//else if (subModel.SubcontractorIsAllPass == 1)
//{
// labSupervision.Text = "（不通过）";
// labSupervision.CssClass = "pass";
//}
}
else
{
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.designer.cs
Generated
+63 -9
View File
@@ -230,15 +230,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// ddlfbs 控件。
/// </summary>
@@ -248,6 +239,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddlfbs;
/// <summary>
/// labSubcontractor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labSubcontractor;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// ddlcbs 控件。
/// </summary>
@@ -257,6 +266,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddlcbs;
/// <summary>
/// labContractor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labContractor;
/// <summary>
/// Toolbar4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar4;
/// <summary>
/// ddljl 控件。
/// </summary>
@@ -266,6 +293,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.DropDownList ddljl;
/// <summary>
/// labSupervision 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labSupervision;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// ddlyz 控件。
/// </summary>
@@ -274,5 +319,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlyz;
/// <summary>
/// labOwner 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label labOwner;
}
}