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

提交试车代码

This commit is contained in:
高飞 2023-11-06 11:16:46 +08:00
parent 5a130a619b
commit 0b84177640
30 changed files with 2021 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DataBase/版本日志/SGGLDB_WH_2023-11-06.sql Normal file
View File

@ -0,0 +1,18 @@
--老数据清理
truncate table PreRun_SubInspectTerm
truncate table PreRun_SubInspectTermItem
truncate table PreRun_InspectTailTerm
truncate table PreRun_InspectTermApproveRecords
GO
delete Sys_Menu where MenuId='AF88737F-D665-4C81-99D5-A07A8910C1E0'
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)VALUES('AF88737F-D665-4C81-99D5-A07A8910C1E0','检查表流转全部通过',null,'TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx',14,'AD6E08B6-5571-4FFB-BDBE-9E6811770BD6','Menu_TestRun',0,1,1)
GO
--是否统一流转0:否1:是
alter table PreRun_SubInspectTerm add IsUnifyWanderAbout int null
GO
--统一流转时间
alter table PreRun_SubInspectTerm add UnifyWanderAboutData datetime null
GO
--统一流转审核意见
alter table PreRun_SubInspectTerm add UnifyWanderAboutOpinion varchar(max) null
GO

21
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1676,9 +1676,12 @@
<Content Include="TestRun\BeforeTestRun\InspectTailTermList.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectTemplate.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectTemplateEdit.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectWanderAboutAllPass.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectWanderAboutConfirm.aspx" />
<Content Include="TestRun\BeforeTestRun\InspectWanderAboutList.aspx" />
<Content Include="TestRun\BeforeTestRun\SelectProperty.aspx" />
<Content Include="TestRun\BeforeTestRun\SelectTailTermList.aspx" />
<Content Include="TestRun\BeforeTestRun\SelectTechnology.aspx" />
<Content Include="TestRun\BeforeTestRun\SetWorkPackage.aspx" />
<Content Include="TestRun\BeforeTestRun\SiteImplementation.aspx" />
@ -15146,6 +15149,18 @@
<Compile Include="TestRun\BeforeTestRun\InspectTemplateEdit.aspx.designer.cs">
<DependentUpon>InspectTemplateEdit.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPass.aspx.cs">
<DependentUpon>InspectWanderAboutAllPass.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPass.aspx.designer.cs">
<DependentUpon>InspectWanderAboutAllPass.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx.cs">
<DependentUpon>InspectWanderAboutAllPassList.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\InspectWanderAboutAllPassList.aspx.designer.cs">
<DependentUpon>InspectWanderAboutAllPassList.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\InspectWanderAboutConfirm.aspx.cs">
<DependentUpon>InspectWanderAboutConfirm.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@ -15167,6 +15182,12 @@
<Compile Include="TestRun\BeforeTestRun\SelectProperty.aspx.designer.cs">
<DependentUpon>SelectProperty.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\SelectTailTermList.aspx.cs">
<DependentUpon>SelectTailTermList.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\SelectTailTermList.aspx.designer.cs">
<DependentUpon>SelectTailTermList.aspx</DependentUpon>
</Compile>
<Compile Include="TestRun\BeforeTestRun\SelectTechnology.aspx.cs">
<DependentUpon>SelectTechnology.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx
View File

@ -138,6 +138,8 @@
DataKeyNames="InspectTermId" EnableColumnLines="true" ForceFit="true">
<Columns>
<f:RowNumberField />
<f:RenderField ColumnID="ConstructionUnitName" Width="300px" DataField="ConstructionUnitName" HeaderText="施工单位" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveStateName" Width="100px" DataField="ApproveStateName" HeaderText="处理状态" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveTime" Width="150px" DataField="ApproveTime" HeaderText="处理时间" HeaderTextAlign="Center">
@ -158,6 +160,8 @@
DataKeyNames="InspectTermId" EnableColumnLines="true" ForceFit="true">
<Columns>
<f:RowNumberField />
<f:RenderField ColumnID="ConstructionUnitName" Width="300px" DataField="ConstructionUnitName" HeaderText="施工单位" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveStateName" Width="100px" DataField="ApproveStateName" HeaderText="审核状态" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveTime" Width="150px" DataField="ApproveTime" HeaderText="审核时间" HeaderTextAlign="Center">

56
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
View File

@ -14,7 +14,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public partial class InspectTailTermEdit : PageBase
{
/// <summary>
/// 主键
/// 检查表尾项主键
/// </summary>
public string TailTermId
{
@ -23,7 +23,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
/// <summary>
/// 主键
/// 检查项主键
/// </summary>
public string TermItemId
{
@ -196,16 +196,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//绑定检查项
if (!string.IsNullOrWhiteSpace(ddlSubInspectId.SelectedValue))
{
var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
var list = new List<PreRun_SubInspectTermItem>();
if (TermItemIds.Count > 0)
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
}
else
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
}
//var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
//var list = new List<PreRun_SubInspectTermItem>();
//if (TermItemIds.Count > 0)
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
//}
//else
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
//}
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
if (list.Count() > 0)
{
ddlTermItemId.DataTextField = "WorkInspectName";
@ -287,7 +289,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void gvRecordBrid()
{
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveType when 0 then (case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) else (case a.ApproveState when 0 then '审批退回' when 1 then '审批通过' else '' end) end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@TailTermId", this.TailTermId));
@ -375,6 +377,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
Funs.DB.PreRun_InspectTailTerm.InsertOnSubmit(model);
}
//判断尾项是否保存
var itemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == this.TermItemId);
if (itemModel != null) itemModel.InspectionResults = 0;
Funs.DB.SubmitChanges();
ShowNotify("操作成功!", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
@ -483,7 +488,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
var selectList = new List<SelectPropertyTechnology>();
var wtype = int.Parse(ddlProblemType.SelectedValue);
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == wtype).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
//var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.WorkPackType == wtype).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => (x.InspectionResults == 0 && x.WorkPackType == wtype) || x.TermItemId == this.TermItemId).GroupBy(x => new { x.SubInspectId, x.InspectionResults, x.PropertyTechnologyId, x.WorkPackType });
if (list.Count() > 0)
{
var ids = string.Join(",", list.Select(x => x.Key.PropertyTechnologyId)).Split(',');
@ -546,16 +552,18 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected void ddlSubInspectId_SelectedIndexChanged(object sender, EventArgs e)
{
if (string.IsNullOrWhiteSpace(ddlSubInspectId.SelectedValue)) return;
var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
var list = new List<PreRun_SubInspectTermItem>();
if (TermItemIds.Count > 0)
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
}
else
{
list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
}
//var TermItemIds = Funs.DB.PreRun_InspectTailTerm.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TailTermId != this.TailTermId).Select(a => a.TermItemId).ToList();
//var list = new List<PreRun_SubInspectTermItem>();
//if (TermItemIds.Count > 0)
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue && !TermItemIds.Contains(x.TermItemId)).ToList();
//}
//else
//{
// list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue).ToList();
//}
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => (x.InspectionResults == 0 && x.SubInspectId == ddlSubInspectId.SelectedValue) || x.TermItemId == this.TermItemId).ToList();
ddlTermItemId.Items.Clear();
if (list.Count() > 0)
{

125
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPass.aspx Normal file
View File

@ -0,0 +1,125 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPass.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectWanderAboutAllPass" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>全部通过</title>
<style>
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.mycheckbox .f-field-checkbox-switch .f-field-checkbox-switch-text {
min-width: 40px;
}
.f-grid-tpl .ispass input {
margin: 3px;
}
.f-grid-tpl .ispass label {
margin-left: 3px;
margin-right: 10px;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" Title="全部通过" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lblProjectName" runat="server" Label="项目名称" LabelAlign="Right"></f:Label>
<f:Label ID="lblProjectCode" runat="server" Label="项目号" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblWorkPackTypeName" runat="server" Label="类型" LabelAlign="Right"></f:Label>
<f:Label ID="lblWorkPackName" runat="server" Label="工作包名称" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblSubcontractorName" runat="server" Label="分包商" LabelAlign="Right"></f:Label>
<f:Label ID="lblContractorName" runat="server" Label="承包商" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblSupervisionName" runat="server" Label="监理" LabelAlign="Right"></f:Label>
<f:Label ID="lblOwnerName" runat="server" Label="业主" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtUnifyWanderAboutOpinion" ShowRedStar="true" Required="true" runat="server" Label="审核意见" MaxLength="3000"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel Title="是否统一流转" ShowBorder="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" runat="server">
<f:RadioButtonList ID="rblIsUnifyWanderAbout" Label="是否统一流转" LabelWidth="180px" LabelAlign="Right" ColumnNumber="2" runat="server" AutoColumnWidth="true">
<f:RadioItem Text="通过" Value="1" Selected="true" />
<f:RadioItem Text="未通过" Value="0" />
</f:RadioButtonList>
<f:Panel ID="Panel3" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="lblAttach" runat="server" Label="上传附件" LabelWidth="180px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnConfirm" Icon="SystemSaveNew" runat="server" Text="确认" ToolTip="确认" ValidateForms="SimpleForm1" OnClick="btnConfirm_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>

168
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPass.aspx.cs Normal file
View File

@ -0,0 +1,168 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class InspectWanderAboutAllPass : PageBase
{
/// <summary>
/// 检查表主键
/// </summary>
public string SubInspectId
{
get { return (string)ViewState["SubInspectId"]; }
set { ViewState["SubInspectId"] = value; }
}
/// <summary>
/// 统一处理附件
/// </summary>
public int UnifyImg
{
get { return (int)ViewState["UnifyImg"]; }
set { ViewState["UnifyImg"] = value; }
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.UnifyImg = 0;
this.SubInspectId = Request["SubInspectId"];
PageInit();
}
}
/// <summary>
/// 绑定数据
/// </summary>
public void PageInit()
{
var data = from term in Funs.DB.PreRun_SubInspectTerm
join workpage in Funs.DB.PreRun_WorkPackage on term.WorkPackId equals workpage.WorkPackId
join pro in Funs.DB.Base_Project on term.ProjectId equals pro.ProjectId
join subuser in Funs.DB.Sys_User on term.Subcontractor equals subuser.UserId
join conuser in Funs.DB.Sys_User on term.Contractor equals conuser.UserId
join supuser in Funs.DB.Sys_User on term.Supervision equals supuser.UserId
join ownuser in Funs.DB.Sys_User on term.Owner equals ownuser.UserId
where term.SubInspectId == this.SubInspectId
select new
{
term.SubInspectId,
term.ProjectId,
pro.ProjectName,
pro.ProjectCode,
term.WorkPackId,
workpage.WorkPackName,
term.WorkPackType,
term.AddUser,
term.AddTime,
SubcontractorName = subuser.UserName,
ContractorName = conuser.UserName,
SupervisionName = supuser.UserName,
OwnerName = ownuser.UserName,
term.IsUnifyWanderAbout,
term.UnifyWanderAboutData,
term.UnifyWanderAboutOpinion
};
if (data.Count() > 0)
{
var model = data.FirstOrDefault();
//项目名称
lblProjectName.Text = model.ProjectName;
//项目号
lblProjectCode.Text = model.ProjectCode;
//类型
lblWorkPackTypeName.Text = model.WorkPackType == 1 ? "管道" : "设备";
//工作包名称
lblWorkPackName.Text = model.WorkPackName;
//分包商
lblSubcontractorName.Text = model.SubcontractorName;
//承包商
lblContractorName.Text = model.ContractorName;
//监理
lblSupervisionName.Text = model.SupervisionName;
//业主
lblOwnerName.Text = model.OwnerName;
//是否统一流转
rblIsUnifyWanderAbout.SelectedValue = model.IsUnifyWanderAbout != null ? model.IsUnifyWanderAbout.ToString() : "1";
//审核意见
txtUnifyWanderAboutOpinion.Text = model.UnifyWanderAboutOpinion;
}
}
/// <summary>
/// 确认
/// </summary>
protected void btnConfirm_Click(object sender, EventArgs e)
{
try
{
if (Funs.DB.AttachFile.Count(x => x.ToKeyId == this.SubInspectId + "_unify" && x.AttachUrl != null && x.AttachUrl != "") == 0)
{
ShowNotify("请上传附件！", MessageBoxIcon.Warning);
return;
}
var term = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
if (term != null)
{
var isPass = int.Parse(rblIsUnifyWanderAbout.SelectedValue);
term.IsUnifyWanderAbout = isPass;
term.UnifyWanderAboutData = DateTime.Now;
term.UnifyWanderAboutOpinion = txtUnifyWanderAboutOpinion.Text;
term.SubcontractorIsAllPass = isPass;
term.ContractorIsAllPass = isPass;
term.SupervisionIsAllPass = isPass;
term.OwnerIsAllPass = isPass;
term.WanderIsComplete = isPass;
if (isPass == 1)
{
term.SubcontractorAllPassData = DateTime.Now;
term.ContractorAllPassData = DateTime.Now;
term.SupervisionAllPassData = DateTime.Now;
term.OwnerAllPassData = DateTime.Now;
term.WanderCompleteData = DateTime.Now;
}
else
{
term.SubcontractorAllPassData = null;
term.ContractorAllPassData = null;
term.SupervisionAllPassData = null;
term.OwnerAllPassData = null;
term.WanderCompleteData = null;
}
var termIetms = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).ToList();
if (termIetms.Count > 0)
{
foreach (var item in termIetms)
{
item.SubcontractorIsPass = isPass;
item.ContractorIsPass = isPass;
item.SupervisionIsPass = isPass;
item.OwnerIsPass = isPass;
Funs.DB.SubmitChanges();
}
}
ShowNotify("确认成功!", MessageBoxIcon.Success);
}
}
catch (Exception ex)
{
ShowNotify(ex.Message, MessageBoxIcon.Error);
}
}
/// <summary>
/// 附件上传
/// </summary>
protected void btnAttach_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", UnifyImg, this.SubInspectId + "_unify", Const.TestRunMenuId)));
}
}
}

215
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPass.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,215 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class InspectWanderAboutAllPass
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// lblProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblProjectName;
/// <summary>
/// lblProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblProjectCode;
/// <summary>
/// lblWorkPackTypeName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblWorkPackTypeName;
/// <summary>
/// lblWorkPackName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblWorkPackName;
/// <summary>
/// lblSubcontractorName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSubcontractorName;
/// <summary>
/// lblContractorName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblContractorName;
/// <summary>
/// lblSupervisionName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSupervisionName;
/// <summary>
/// lblOwnerName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblOwnerName;
/// <summary>
/// txtUnifyWanderAboutOpinion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtUnifyWanderAboutOpinion;
/// <summary>
/// rblIsUnifyWanderAbout 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsUnifyWanderAbout;
/// <summary>
/// Panel3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel3;
/// <summary>
/// lblAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblAttach;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnConfirm 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnConfirm;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
}

148
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx Normal file
View File

@ -0,0 +1,148 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectWanderAboutAllPassList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.InspectWanderAboutAllPassList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<title>检查表流转全部通过</title>
<style type="text/css">
.labcenter {
text-align: center;
}
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.LabelColor {
color: Red;
font-size: small;
}
.Green {
background-color: Green;
color: white;
}
.Yellow {
background-color: #FFFF93;
}
.Red {
background-color: red;
}
.LightGreen {
background-color: LightGreen
}
.f-grid-colheader-text {
white-space: normal;
word-break: break-all;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="300px" Title="检查表流转全部通过" ShowBorder="true" Layout="VBox"
ShowHeader="false" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="工作包" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true"
AutoLeafIdentification="true" EnableSingleExpand="false">
</f:Tree>
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="检查表流转全部通过" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="SubInspectId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="SubInspectId" AllowSorting="true" SortField="AddTime"
SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" ForceFit="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" AllowFilters="true" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="ddlWorkPackType" runat="server" Label="检查类型" Width="210px" LabelAlign="Right" EnableEdit="true">
<f:ListItem Text="全部" Value="" />
<f:ListItem Text="管道" Value="1" />
<f:ListItem Text="设备" Value="2" />
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnQuery" OnClick="btnQuery_Click" ToolTip="查询" Text="搜索" Icon="SystemSearch" EnablePostBack="true" runat="server"></f:Button>
<f:Button ID="btnAllPass" ToolTip="检查全部通过" Icon="Accept" Text="检查全部通过" runat="server" OnClick="btnAllPass_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField />
<f:RenderField ColumnID="ProjectName" DataField="ProjectName" Width="300px" HeaderText="项目名称" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="WorkPackTypeName" DataField="WorkPackTypeName" HeaderText="类型" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="WorkPackName" DataField="WorkPackName" Width="300px" HeaderText="工作包名称" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractorName" DataField="SubcontractorName" Width="100px" HeaderText="分包商" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractorName" DataField="ContractorName" Width="100px" HeaderText="承包商" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SupervisionName" DataField="SupervisionName" Width="100px" HeaderText="监理" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="OwnerName" DataField="OwnerName" Width="100px" HeaderText="业主" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsUnifyWanderAboutName" DataField="IsUnifyWanderAboutName" Width="100px" HeaderText="是否全部通过" HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="检查全部通过" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" CloseAction="HidePostBack" OnClose="Window1_Close" AutoScroll="true"
Width="1300px" Height="660px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuAllPass" EnablePostBack="true" runat="server" Text="检查全部通过" Icon="Pencil"
OnClick="btnMenuAllPass_Click">
</f:MenuButton>
</Items>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
</script>
</body>
</html>

296
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs Normal file
View File

@ -0,0 +1,296 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using static FineUIPro.Web.TestRun.BeforeTestRun.InspectTailTermEdit;
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class InspectWanderAboutAllPassList : PageBase
{
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
InitTreeMenu();
}
}
#region 数加载
/// <summary>
/// 加载树
/// </summary>
private void InitTreeMenu()
{
this.tvControlItem.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "检查表";
rootNode.NodeID = "0";
rootNode.Expanded = true;
rootNode.ToolTip = "";
rootNode.EnableClickEvent = true;
this.tvControlItem.Nodes.Add(rootNode);
var inspectTerms = Funs.DB.PreRun_SubInspectTerm.Where(x => x.InspectionIsAllPass == 1).ToList();
if (inspectTerms.Count == 0) return;
var subSystemIds = inspectTerms.ConvertAll(x => x.SubSystemId);
var workPackIds = inspectTerms.ConvertAll(x => x.WorkPackId);
var list = from a in Funs.DB.PreRun_SysDevice
join b in Funs.DB.PreRun_SubSysWorkPackage on a.PreRunId equals b.SubSystemId
join c in Funs.DB.PreRun_WorkPackage on b.WorkPackId equals c.WorkPackId
where a.ProjectId == this.CurrUser.LoginProjectId && subSystemIds.Contains(a.PreRunId) && workPackIds.Contains(c.WorkPackId)
select new { a.PreRunId, a.SystemId, a.PreRunCode, a.PreRunName, a.ProjectId, c.WorkPackId, c.WorkPackName, b.WorkPackCode };
if (list.Count() > 0)
{
var selectlist = YscInspectItems(workPackIds, subSystemIds);
var systemIds = list.Select(x => x.SystemId).ToList();
var syslist = Funs.DB.PreRun_SysDevice.Where(x => systemIds.Contains(x.PreRunId));
foreach (var itemSys in syslist)
{
TreeNode rootFirstNode = new TreeNode();//定义根节点
rootFirstNode.NodeID = itemSys.PreRunId;
rootFirstNode.Text = itemSys.PreRunName;
rootFirstNode.ToolTip = itemSys.PreRunName;
rootFirstNode.CommandName = "";
rootFirstNode.EnableClickEvent = false;
rootFirstNode.EnableExpandEvent = false;
rootNode.Nodes.Add(rootFirstNode);
rootFirstNode.Expanded = true;
var subList = list.Where(g => g.SystemId == itemSys.PreRunId).GroupBy(x => new { x.PreRunId, x.SystemId, x.PreRunCode, x.PreRunName });
foreach (var item in subList)
{
TreeNode rootUnitNode = new TreeNode();//定义根节点
rootUnitNode.NodeID = item.Key.PreRunId;
rootUnitNode.Text = item.Key.PreRunName;
rootUnitNode.ToolTip = item.Key.PreRunName;
rootUnitNode.CommandName = "";
rootUnitNode.EnableClickEvent = false;
rootUnitNode.EnableExpandEvent = false;
rootFirstNode.Nodes.Add(rootUnitNode);
rootUnitNode.Expanded = true;
var worklist = list.Where(a => a.PreRunId == item.Key.PreRunId).GroupBy(x => new { x.WorkPackId, x.WorkPackName, x.WorkPackCode }).ToList();
if (worklist.Count > 0)
{
foreach (var itemWork in worklist.OrderBy(o => o.Key.WorkPackCode))
{
TreeNode newNode = new TreeNode();
newNode.Text = itemWork.Key.WorkPackName;
newNode.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId;
newNode.ToolTip = itemWork.Key.WorkPackName;
newNode.CommandName = "";
newNode.EnableClickEvent = false;
newNode.EnableExpandEvent = false;
rootUnitNode.Nodes.Add(newNode);
newNode.Expanded = true;
if (selectlist.Count > 0)
{
var workselects = selectlist.Where(x => x.SubSystemId == item.Key.PreRunId && x.WorkPackId == itemWork.Key.WorkPackId);
foreach (var itemSelect in workselects)
{
TreeNode newNodeSelect = new TreeNode();
newNodeSelect.Text = itemSelect.Code.Length > 10 ? $"{itemSelect.Code.Substring(0, 10)}......" : itemSelect.Code;
newNodeSelect.NodeID = itemWork.Key.WorkPackId + "|" + item.Key.PreRunId + "|" + itemSelect.Id;
newNodeSelect.ToolTip = itemSelect.Code;
newNodeSelect.CommandName = "";
newNodeSelect.EnableClickEvent = true;
newNodeSelect.EnableExpandEvent = true;
newNode.Nodes.Add(newNodeSelect);
newNodeSelect.Expanded = true;
}
}
}
}
}
}
}
}
/// <summary>
/// 树点击
/// </summary>
protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
{
BindGrid();
}
#endregion
#region 数据绑定
/// <summary>
/// 绑定数据
/// </summary>
public void BindGrid()
{
//分包商
string sqlStr = $"select a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackId,g.WorkPackName,a.WorkPackType,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,a.AddUser,a.AddTime,c.UserName as SubcontractorName,d.UserName as ContractorName,e.UserName as SupervisionName,f.UserName as OwnerName,IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId inner join Sys_User as c on c.UserId=a.Subcontractor inner join Sys_User as d on d.UserId=a.Contractor inner join Sys_User as e on e.UserId = a.Supervision inner join Sys_User as f on f.UserId = a.Owner inner join PreRun_WorkPackage as g on g.WorkPackId = a.WorkPackId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId='{this.CurrUser.LoginProjectId}' ";
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0)
{
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
sqlStr += $"and a.WorkPackId='{workPackId}'";
}
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 1)
{
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
sqlStr += $"and a.SubSystemId='{subSystemId}'";
}
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
var subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
sqlStr += $"and a.SubInspectId='{subInspectId}'";
}
//检查类型
if (!string.IsNullOrWhiteSpace(ddlWorkPackType.SelectedValue))
{
sqlStr += $"and a.WorkPackType='{ddlWorkPackType.SelectedValue}'";
}
List<SqlParameter> listStr = new List<SqlParameter>();
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(sqlStr);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 分页
/// </summary>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
Grid1.PageIndex = e.NewPageIndex;
BindGrid();
}
/// <summary>
/// 双击事件
/// </summary>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
btnMenuAllPass_Click(null, null);
}
/// <summary>
/// 分页下拉框
/// </summary>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region 按钮和事件
/// <summary>
/// 查询
/// </summary>
protected void btnQuery_Click(object sender, EventArgs e)
{
BindGrid();
}
/// <summary>
/// 检查全部通过
/// </summary>
protected void btnAllPass_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择记录！", MessageBoxIcon.Warning);
return;
}
if (Grid1.SelectedRowIndexArray.Length > 1)
{
Alert.ShowInTop("只可选择一条记录！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectWanderAboutAllPass.aspx?SubInspectId={0}", Grid1.DataKeys[Grid1.SelectedRowIndex][0].ToString(), "检查全部通过 - ")));
}
/// <summary>
/// 右击检查全部通过
/// </summary>
protected void btnMenuAllPass_Click(object sender, EventArgs e)
{
btnAllPass_Click(null, null);
}
/// <summary>
/// 关闭
/// </summary>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
}
#endregion
#region 私有方法
/// <summary>
/// 已生成检查表的管道/设备
/// </summary>
private List<SelectPropertyTechnology> YscInspectItems(List<string> workPackIds, List<string> subSystemIds)
{
List<SelectPropertyTechnology> yczData = new List<SelectPropertyTechnology>();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId)).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();
var listPros = Funs.DB.PreRun_PropertySysPiping.Where(x => selectPtids.Contains(x.PropertyId)).ToList();
var listTechno = Funs.DB.PreRun_TechnologySysPiping.Where(x => selectPtids.Contains(x.TechnologyId)).ToList();
foreach (var itemYsc in yscInspectItems)
{
var codeStr = string.Empty;
var ids = itemYsc.PropertyTechnologyId.Split(',');
var itemPros = listPros.Where(x => ids.Contains(x.PropertyId)).ToList();
if (itemPros.Count > 0)
{
codeStr = $"管道：{string.Join(",", itemPros.ConvertAll(x => x.PipingCode))}";
yczData.Add(new SelectPropertyTechnology()
{
Id = itemYsc.SubInspectId,
Code = codeStr,
WorkPackId = itemYsc.WorkPackId,
SubSystemId = itemYsc.SubSystemId
});
}
var itemTechno = listTechno.Where(x => ids.Contains(x.TechnologyId)).ToList();
if (itemTechno.Count > 0)
{
codeStr = $"设备：{string.Join(",", itemTechno.ConvertAll(x => x.TagNumber))}";
yczData.Add(new SelectPropertyTechnology()
{
Id = itemYsc.SubInspectId,
Code = codeStr,
WorkPackId = itemYsc.WorkPackId,
SubSystemId = itemYsc.SubSystemId
});
}
}
}
return yczData;
}
#endregion
}
}

161
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,161 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class InspectWanderAboutAllPassList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// tvControlItem 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ddlWorkPackType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWorkPackType;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// btnAllPass 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAllPass;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuAllPass 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuAllPass;
}
}

136
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx
View File

@ -31,57 +31,90 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Left">
<Rows>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="TermItemId" DataKeyNames="TermItemId,SubItemId,InspectionResults,SubInspectId,IsPass" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowFilters="true" OnSort="Grid1_Sort" EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:FileUpload runat="server" ID="fileData" LabelAlign="Right" EmptyText="请选择Excel文件" Label="附件" Required="true" ButtonIcon="Add" ShowRedStar="true"></f:FileUpload>
<f:Button ID="btnImport" runat="server" OnClick="btnImport_Click" Text="导入"></f:Button>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:Button ID="btnExport" runat="server" Icon="ApplicationGo" Text="导出" ToolTip="导出" OnClick="btnExport_Click"></f:Button>
<f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnSave_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<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">
<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>
<asp:ListItem Text="未通过" Value="0"></asp:ListItem>
</asp:RadioButtonList>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="300px">
<Editor>
<f:TextBox runat="server" ID="txtRemark"></f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
<Items>
<f:ContentPanel Title="是否同意进行预试车活动" ShowBorder="true" BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" runat="server">
<f:RadioButtonList ID="rblIsAllPass" Label="是否同意进行预试车活动" LabelWidth="180px" LabelAlign="Right" ColumnNumber="2" runat="server" AutoColumnWidth="true" AutoPostBack="true" OnSelectedIndexChanged="rblIsAllPass_SelectedIndexChanged">
<f:RadioItem Text="通过" Value="1" Selected="true" />
<f:RadioItem Text="未通过" Value="0" />
</f:RadioButtonList>
<f:Panel ID="Panel3" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="lblAttach" runat="server" Label="上传附件" LabelWidth="180px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
<f:ContentPanel ID="titleName" Title="检查项列表" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server" DataIDField="TermItemId" DataKeyNames="TermItemId,SubItemId,InspectionResults,SubInspectId,IsPass" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowFilters="true" OnSort="Grid1_Sort" EnableTextSelection="True" OnRowDataBound="Grid1_RowDataBound" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:FileUpload runat="server" ID="fileData" LabelAlign="Right" EmptyText="请选择Excel文件" Label="附件" Required="true" ButtonIcon="Add" ShowRedStar="true"></f:FileUpload>
<f:Button ID="btnImport" runat="server" OnClick="btnImport_Click" Text="导入"></f:Button>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:Button ID="btnExport" runat="server" Icon="ApplicationGo" Text="导出" ToolTip="导出" OnClick="btnExport_Click"></f:Button>
<f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnSave_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<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">
<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>
<asp:ListItem Text="未通过" Value="0"></asp:ListItem>
</asp:RadioButtonList>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="备注" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="300px">
<Editor>
<f:TextBox runat="server" ID="txtRemark"></f:TextBox>
</Editor>
</f:RenderField>
</Columns>
</f:Grid>
</f:ContentPanel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" Title="检查项确认" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblIsAllPass" Label="是否同意进行预试车活动" LabelWidth="180px" LabelAlign="Right" ColumnNumber="2" runat="server" AutoColumnWidth="true" AutoPostBack="true" OnSelectedIndexChanged="rblIsAllPass_SelectedIndexChanged">
<f:RadioItem Text="通过" Value="1" Selected="true" />
<f:RadioItem Text="未通过" Value="0" />
</f:RadioButtonList>
<f:Panel ID="Panel3" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="lblAttach" runat="server" Label="上传附件" LabelWidth="180px" LabelAlign="Right">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblIsUnifyWanderAbout" runat="server" Label="是否统一流转通过" LabelWidth="160px" LabelAlign="Right"></f:Label>
<f:Label ID="lblUnifyWanderAboutData" runat="server" Label="统一流转通过时间" LabelWidth="160px" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow ID="unifyfile">
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="统一流转通过附件：" CssStyle="padding-left:25px" Width="160px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="btnUnifyUpload" Text="查看" ToolTip="查看" Icon="TableCell" runat="server"
OnClick="btnUnifyUpload_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
@ -100,11 +133,6 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
function onUpdateIsPassClick() {
alert(1);
}
</script>
</body>
</html>

24
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.cs
View File

@ -78,6 +78,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void BindGrid(int isPass = -1)
{
var term = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == this.SubInspectId);
if (term != null)
{
lblIsUnifyWanderAbout.Text = term.IsUnifyWanderAbout == 1 ? "是" : "否";
lblUnifyWanderAboutData.Text = term.UnifyWanderAboutData != null ? term.UnifyWanderAboutData.Value.ToString("yyyy-MM-dd") : string.Empty;
unifyfile.Hidden = term.IsUnifyWanderAbout == 1 ? false : true;
}
//获取子系统
var data = new List<ConfirmIsPass>();
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == this.SubInspectId).OrderBy(x => x.Sort).ToList();
@ -119,7 +126,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
Grid1.DataSource = data;
Grid1.DataBind();
Grid1.Title = this.ConfirmType == 1 ? "分包商确认签字" : this.ConfirmType == 2 ? "承包商确认签字" : this.ConfirmType == 3 ? "监理确认签字" : this.ConfirmType == 4 ? "业主确认签字" : "";
titleName.Title = this.ConfirmType == 1 ? "分包商确认签字" : this.ConfirmType == 2 ? "承包商确认签字" : this.ConfirmType == 3 ? "监理确认签字" : this.ConfirmType == 4 ? "业主确认签字" : "";
}
/// <summary>
@ -212,7 +219,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
else
{
subModel.ContractorIsAllPass = 0;
subModel.SubcontractorAllPassData = null;
subModel.ContractorAllPassData = null;
}
}
else if (this.ConfirmType == 3)
@ -225,7 +232,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
else
{
subModel.SupervisionIsAllPass = 0;
subModel.SubcontractorAllPassData = null;
subModel.SupervisionAllPassData = null;
}
}
else if (this.ConfirmType == 4)
@ -238,7 +245,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
else
{
subModel.OwnerIsAllPass = 0;
subModel.SubcontractorAllPassData = null;
subModel.OwnerAllPassData = null;
}
}
//判断是否全部通过
@ -800,6 +807,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", $"{this.SubInspectId}_{this.ConfirmType}", Const.TestRunMenuId)));
}
/// <summary>
/// 统一流转通过附件查看
/// </summary>
protected void btnUnifyUpload_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CheckControl&menuId={1}", this.SubInspectId + "_unify", Const.TestRunMenuId)));
}
#endregion
#region 私有方法
@ -885,6 +900,5 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
#endregion
}
}

76
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutConfirm.aspx.designer.cs generated
View File

@ -41,6 +41,24 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// plApprove2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow plApprove2;
/// <summary>
/// titleName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel titleName;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -123,13 +141,22 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// plApprove2 控件。
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow plApprove2;
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// Form2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form2;
/// <summary>
/// rblIsAllPass 控件。
@ -167,6 +194,51 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// lblIsUnifyWanderAbout 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblIsUnifyWanderAbout;
/// <summary>
/// lblUnifyWanderAboutData 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblUnifyWanderAboutData;
/// <summary>
/// unifyfile 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow unifyfile;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// btnUnifyUpload 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnUnifyUpload;
/// <summary>
/// WindowAtt 控件。
/// </summary>

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx
View File

@ -95,6 +95,8 @@
</f:RenderField>
<f:RenderField ColumnID="FailConfirmNum" DataField="FailConfirmNum" Width="110px" HeaderText="检查项确认未通过数" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsUnifyWanderAboutName" DataField="IsUnifyWanderAboutName" Width="110px" HeaderText="是否统一流转" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

8
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs
View File

@ -129,13 +129,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public void BindGrid()
{
//分包商
string subcontractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,1 as ConfirmType,'分包商' as ConfirmName,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass is null) as WaitConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=1) as PassConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.Subcontractor='{this.CurrUser.UserId}' ";
string subcontractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,1 as ConfirmType,'分包商' as ConfirmName,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass is null) as WaitConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=1) as PassConfirmNum,(select count (1) from PreRun_SubInspectTermItem as t where t.SubInspectId=a.SubInspectId and t.SubcontractorIsPass=0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId=b.ProjectId where 1=1 and a.InspectionIsAllPass=1 and a.ProjectId='{this.CurrUser.LoginProjectId}' and a.Subcontractor='{this.CurrUser.UserId}' ";
//承包商
string contractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,2 as ConfirmType,'承包商' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Contractor = '{this.CurrUser.UserId}' ";
string contractorStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,2 as ConfirmType,'承包商' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.ContractorIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Contractor = '{this.CurrUser.UserId}' ";
//监理
string supervisionStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,3 as ConfirmType,'监理' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Supervision = '{this.CurrUser.UserId}' ";
string supervisionStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,3 as ConfirmType,'监理' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.SupervisionIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Supervision = '{this.CurrUser.UserId}' ";
//业主
string ownerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,4 as ConfirmType,'业主' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Owner = '{this.CurrUser.UserId}' ";
string ownerStr = $"select NEWID() as Id,a.SubInspectId,a.ProjectId,b.ProjectName,b.ProjectCode,a.WorkPackType,a.Subcontractor,a.Contractor,a.Supervision,a.Owner,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,4 as ConfirmType,'业主' as ConfirmName,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass is null) as WaitConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 1) as PassConfirmNum,(select count(1) from PreRun_SubInspectTermItem as t where t.SubInspectId = a.SubInspectId and t.OwnerIsPass = 0) as FailConfirmNum,a.AddUser,a.AddTime,a.IsUnifyWanderAbout,(case IsUnifyWanderAbout when 1 then '是' else '否' end) as IsUnifyWanderAboutName from PreRun_SubInspectTerm as a inner join Base_Project as b on a.ProjectId = b.ProjectId where 1 = 1 and a.InspectionIsAllPass = 1 and a.ProjectId = '{this.CurrUser.LoginProjectId}' and a.Owner = '{this.CurrUser.UserId}' ";
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0)
{

44
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTailTermList.aspx Normal file
View File

@ -0,0 +1,44 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="SelectTailTermList.aspx.cs" Inherits="FineUIPro.Web.TestRun.BeforeTestRun.SelectTailTermList" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title></title>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="TailTermId" DataIDField="TailTermId" ForceFit="true"
AllowSorting="true" SortField="AddTime" SortDirection="DESC" OnSort="Grid1_Sort" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
EnableColumnLines="true" AllowPaging="true" PageSize="1000">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="Accept" runat="server" OnClick="btnSave_Click" Text="确认" ToolTip="确认">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" Width="100px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="250px" ColumnID="TailTermCode" DataField="TailTermCode"
FieldType="String" HeaderText="巡检编号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="ConstructionUnit" DataField="ConstructionUnit" SortField="ConstructionUnit"
FieldType="String" HeaderText="施工单位" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:BoundField DataField="AdjustCompleteTime" DataFormatString="{0:yyyy-MM-dd}" HeaderText="整改完成时间" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</form>
</body>
</html>

88
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTailTermList.aspx.cs Normal file
View File

@ -0,0 +1,88 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class SelectTailTermList : PageBase
{
/// <summary>
/// 检查项主键
/// </summary>
public string TermItemId
{
get { return (string)ViewState["TermItemId"]; }
set { ViewState["TermItemId"] = value; }
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.TermItemId = Request["TermItemId"];
DataBrid();
}
}
/// <summary>
/// 数据绑定
/// </summary>
public void DataBrid()
{
var list = from a in Funs.DB.PreRun_InspectTailTerm
join b in Funs.DB.Base_Unit on a.ConstructionUnit equals b.UnitId
where a.TermItemId == this.TermItemId && a.ApproveState == 0
orderby a.AddTime
select new
{
a.TailTermId,
a.AddTime,
a.TailTermCode,
ConstructionUnit = b.UnitName,
a.AdjustCompleteTime
};
Grid1.RecordCount = list.Count();
Grid1.DataSource = list;
Grid1.DataBind();
}
/// <summary>
/// 排序
/// </summary>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
DataBrid();
}
#region 确认
/// <summary>
/// 确认
/// </summary>
protected void btnSave_Click(object sender, EventArgs e)
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return;
}
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Grid1.SelectedRowID) + ActiveWindow.GetHidePostBackReference());
}
#endregion
/// <summary>
/// 表格双击事件
/// </summary>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(Grid1.SelectedRowID) + ActiveWindow.GetHidePostBackReference());
}
}
}

71
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SelectTailTermList.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.TestRun.BeforeTestRun
{
public partial class SelectTailTermList
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
}
}

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx
View File

@ -77,7 +77,7 @@
<f:RadioItem Text="已完成" Value="1" />
<f:RadioItem Text="未完成" Value="0" Selected="true" />
</f:RadioButtonList>
<f:Label ID="lblRecordUploadData" Label="确认日期" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
<f:Label ID="lblSiteImplementConfirmData" Label="确认日期" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@ -90,7 +90,7 @@
</f:Button>
</Items>
</f:Panel>
<f:Label ID="lblSiteImplementConfirmData" Label="记录上传日期" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
<f:Label ID="lblRecordUploadData" Label="记录上传日期" Text="" runat="server" LabelAlign="Right" LabelWidth="150px"></f:Label>
</Items>
</f:FormRow>
</Rows>

10
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx.cs
View File

@ -139,20 +139,20 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (!string.IsNullOrWhiteSpace(lblRecordUploadData.Text))
{
subModel.RecordUploadData = DateTime.Parse(lblRecordUploadData.Text);
subModel.SiteImplementUser = this.CurrUser.UserId;
}
else
{
subModel.RecordUploadData = null;
subModel.SiteImplementUser = string.Empty;
}
if (!string.IsNullOrWhiteSpace(lblSiteImplementConfirmData.Text))
{
subModel.SiteImplementConfirmData = DateTime.Parse(lblRecordUploadData.Text);
subModel.SiteImplementConfirmData = DateTime.Parse(lblSiteImplementConfirmData.Text);
subModel.SiteImplementUser = this.CurrUser.UserId;
}
else
{
subModel.SiteImplementConfirmData = null;
subModel.SiteImplementUser = string.Empty;
}
}
Funs.DB.SubmitChanges();
@ -165,7 +165,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void rblIsSiteImplement_SelectedIndexChanged(object sender, EventArgs e)
{
lblRecordUploadData.Text = rblIsSiteImplement.SelectedValue == "1" ? DateTime.Now.ToString("yyyy-MM-dd") : string.Empty;
lblSiteImplementConfirmData.Text = rblIsSiteImplement.SelectedValue == "1" ? DateTime.Now.ToString("yyyy-MM-dd") : string.Empty;
}
/// <summary>
@ -181,7 +181,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
{
lblSiteImplementConfirmData.Text = Funs.DB.AttachFile.Count(x => x.ToKeyId == this.SubInspectId + "_xcss" && x.AttachUrl != null && x.AttachUrl != "") > 0 ? DateTime.Now.ToString("yyyy-MM-dd") : string.Empty;
lblRecordUploadData.Text = Funs.DB.AttachFile.Count(x => x.ToKeyId == this.SubInspectId + "_xcss" && x.AttachUrl != null && x.AttachUrl != "") > 0 ? DateTime.Now.ToString("yyyy-MM-dd") : string.Empty;
}
#endregion

8
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementation.aspx.designer.cs generated
View File

@ -159,13 +159,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.RadioButtonList rblIsSiteImplement;
/// <summary>
/// lblRecordUploadData 控件。
/// lblSiteImplementConfirmData 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblRecordUploadData;
protected global::FineUIPro.Label lblSiteImplementConfirmData;
/// <summary>
/// Panel1 控件。
@ -186,13 +186,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.Button btnRecordUpload;
/// <summary>
/// lblSiteImplementConfirmData 控件。
/// lblRecordUploadData 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSiteImplementConfirmData;
protected global::FineUIPro.Label lblRecordUploadData;
/// <summary>
/// plApprove2 控件。

29
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
View File

@ -307,12 +307,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
Grid1.DataSource = result;
Grid1.DataBind();
//if (result.Count(x => x.isChick) > 0)
//{
// //默认选中行
// var checkids = result.Where(x => x.isChick).Select(a => a.SubItemId);
// Grid1.SelectedRowIDArray = checkids.ToArray();
//}
//检查人绑定
var userList = from user in Funs.DB.Sys_User join projectrole in Funs.DB.Project_ProjectUser on user.UserId equals projectrole.UserId where projectrole.ProjectId == this.CurrUser.LoginProjectId select user;
@ -351,6 +345,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(p => p.TermItemId == rowID);
if (model != null)
{
if (model.InspectionResults != null)
{
ShowNotify("已存在检查结果，无法删除!", MessageBoxIcon.Warning);
return;
}
Funs.DB.PreRun_SubInspectTermItem.DeleteOnSubmit(model);
Funs.DB.SubmitChanges();
BindGrid();
@ -413,6 +412,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
List<PreRun_SubInspectTermItem> subTremItems = new List<PreRun_SubInspectTermItem>();
var subTrem = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
var termItems = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).ToList();
if (termItems.Count > 0 && termItems.Count(x => x.InspectionResults == null) == 0)
{
ShowNotify("所有检查项已存在检查结果，无法保存！", MessageBoxIcon.Warning);
return;
}
JArray mergedData = Grid1.GetMergedData();
foreach (JObject mergedRow in mergedData)
{
@ -454,7 +458,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
subTrem.Subcontractor = ddlfbs.SelectedValue;
subTrem.Contractor = ddlcbs.SelectedValue;
subTrem.Supervision = ddljl.SelectedValue;
subTrem.Owner = ddlyz.SelectedValue;
subTrem.Owner = ddlyz.SelectedValue;
Funs.DB.SubmitChanges();
}
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == termItemId);
@ -522,6 +526,17 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var list = gvList();
var workPackId = this.tvControlItem.SelectedNodeID.Split('|')[0];
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
var subInspectId = string.Empty;
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
var termItems = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId).ToList();
if (termItems.Count(x => x.InspectionResults == null) == 0)
{
ShowNotify("所有检查项已存在检查结果，无法新增！", MessageBoxIcon.Warning);
return;
}
}
//获取子系统
var subSysModel = Funs.DB.PreRun_SysDevice.FirstOrDefault(x => x.PreRunId == subSystemId);
if (subSysModel != null)

13
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx
View File

@ -10,6 +10,10 @@
white-space: normal;
word-break: break-all;
}
.hidethis {
display: none;
}
</style>
</head>
<body>
@ -27,12 +31,13 @@
</f:Tree>
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="TermItemId" DataKeyNames="TermItemId,SubItemId,InspectionResults,SubInspectId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowFilters="true" OnSort="Grid1_Sort" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDataBound="Grid1_RowDataBound" ClicksToEdit="1">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="TermItemId" DataKeyNames="TermItemId,SubItemId,InspectionResults,SubInspectId,IsTailTerm" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowFilters="true" OnSort="Grid1_Sort" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDataBound="Grid1_RowDataBound" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClientClick="if(!isValid()){return false;}" OnClick="btnSave_Click"></f:Button>
<f:TextBox runat="server" ID="hidTailTermId" Hidden="true"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
@ -54,6 +59,7 @@
</Editor>
</f:RenderField>
<f:LinkButtonField Width="100px" TextAlign="Center" ColumnID="TailTerm" CommandName="TailTerm" Text="尾项申请" />
<f:LinkButtonField Width="100px" TextAlign="Center" ColumnID="TailTermUpdate" CommandName="TailTermUpdate" Text="尾项修改" />
</Columns>
</f:Grid>
</Items>
@ -62,6 +68,11 @@
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="660px">
</f:Window>
<f:Window ID="Window2" Title="请选择尾项" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="true" runat="server" IsModal="true" OnClose="Window2_Close"
Width="1300px" Height="660px">
</f:Window>
</form>
<script type="text/javascript">
// 返回false，来阻止浏览器右键菜单

313
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs
View File

@ -3,6 +3,8 @@ using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
@ -125,7 +127,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// <summary>
/// 绑定数据
/// </summary>
public void BindGrid()
public void BindGrid(bool istail = false)
{
var workPackId = this.tvControlItem.SelectedNodeID.Split('|').First();
var subSystemId = this.tvControlItem.SelectedNodeID.Split('|')[1];
@ -135,7 +137,65 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
}
//获取子系统
var list = Funs.DB.PreRun_SubInspectTermItem.Where(x => x.SubInspectId == subInspectId && x.InspectedUser == this.CurrUser.UserId).OrderBy(x => x.Sort).ToList();
var data = from termitem in Funs.DB.PreRun_SubInspectTermItem
join b in Funs.DB.PreRun_InspectTailTerm on termitem.TermItemId equals b.TermItemId into t
from tail in t.DefaultIfEmpty()
where termitem.SubInspectId == subInspectId
&& termitem.InspectedUser == this.CurrUser.UserId
group termitem by new { termitem.TermItemId, termitem.SubItemId, termitem.SubInspectId, termitem.WorkPackId, termitem.ProjectId, termitem.WorkInspectId, termitem.WorkInspectName, termitem.InstallationId, termitem.ProcessesId, termitem.SystemId, termitem.SubSystemId, termitem.InspectedUser, termitem.InspectionResults, termitem.InspectionIllustrate, termitem.Subcontractor, termitem.Contractor, termitem.Supervision, termitem.Owner, termitem.SubcontractorIsPass, termitem.ContractorIsPass, termitem.SupervisionIsPass, termitem.OwnerIsPass, termitem.SubcontractorRemark, termitem.ContractorRemark, termitem.SupervisionRemark, termitem.OwnerRemark, termitem.WorkPackType, termitem.PropertyTechnologyId, termitem.Remark, termitem.AddUser, termitem.AddTime, termitem.Sort, IsTailTerm = tail.TailTermId == null ? 0 : 1 } into gt
orderby gt.Key.Sort
select new TermItemBridDto()
{
TermItemId = gt.Key.TermItemId,
SubItemId = gt.Key.SubItemId,
SubInspectId = gt.Key.SubInspectId,
WorkPackId = gt.Key.WorkPackId,
ProjectId = gt.Key.ProjectId,
WorkInspectId = gt.Key.WorkInspectId,
WorkInspectName = gt.Key.WorkInspectName,
InstallationId = gt.Key.InstallationId,
ProcessesId = gt.Key.ProcessesId,
SystemId = gt.Key.SystemId,
SubSystemId = gt.Key.SubSystemId,
InspectedUser = gt.Key.InspectedUser,
InspectionResults = gt.Key.InspectionResults,
InspectionIllustrate = gt.Key.InspectionIllustrate,
Subcontractor = gt.Key.Subcontractor,
Contractor = gt.Key.Contractor,
Supervision = gt.Key.Supervision,
Owner = gt.Key.Owner,
SubcontractorIsPass = gt.Key.SubcontractorIsPass,
ContractorIsPass = gt.Key.ContractorIsPass,
SupervisionIsPass = gt.Key.SupervisionIsPass,
OwnerIsPass = gt.Key.OwnerIsPass,
SubcontractorRemark = gt.Key.SubcontractorRemark,
ContractorRemark = gt.Key.ContractorRemark,
SupervisionRemark = gt.Key.SupervisionRemark,
OwnerRemark = gt.Key.OwnerRemark,
WorkPackType = gt.Key.WorkPackType,
PropertyTechnologyId = gt.Key.PropertyTechnologyId,
Remark = gt.Key.Remark,
AddUser = gt.Key.AddUser,
AddTime = gt.Key.AddTime,
Sort = gt.Key.Sort,
IsTailTerm = gt.Key.IsTailTerm
};
var list = data.ToList();
//list = list.OrderBy(o => o.Sort).ToList();
if (istail)
{
JArray mergedData = Grid1.GetMergedData();
list.ForEach(a =>
{
var itemRow = mergedData.FirstOrDefault(x => x.Value<string>("id") == a.TermItemId);
JObject values = itemRow.Value<JObject>("values");
var inspectionResults = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionResults")) ? values.Value<string>("InspectionResults") : string.Empty;
if (!string.IsNullOrWhiteSpace(inspectionResults))
{
a.InspectionResults = int.Parse(inspectionResults);
}
});
}
Grid1.DataSource = list;
Grid1.DataBind();
}
@ -161,8 +221,29 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
try
{
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == subInspectId && (x.SubcontractorIsPass != null || x.ContractorIsPass != null || x.SupervisionIsPass != null || x.OwnerIsPass != null)) > 0)
{
ShowNotify("已进入检查表流转，无法修改检查结果!", MessageBoxIcon.Warning);
return;
}
JArray mergedData = Grid1.GetMergedData();
foreach (JObject mergedRow in mergedData)
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
int i = mergedRow.Value<int>("index");
var subItemId = this.Grid1.Rows[i].DataKeys[0].ToString();
if (values.Value<string>("InspectionResults") == "0")
{
if (Funs.DB.PreRun_InspectTailTerm.Count(x => x.TermItemId == subItemId) == 0)
{
ShowNotify("未通过的检查项请填写尾项!", MessageBoxIcon.Warning);
return;
}
}
}
foreach (JObject mergedRow in mergedData)
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
@ -172,7 +253,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var model = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == subItemId);
if (model != null)
{
//model.SubInspectId
model.InspectionIllustrate = !string.IsNullOrWhiteSpace(values.Value<string>("InspectionIllustrate")) ? values.Value<string>("InspectionIllustrate") : string.Empty;
if (!string.IsNullOrWhiteSpace(values.Value<string>("InspectionResults")))
{
@ -181,7 +261,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
Funs.DB.SubmitChanges();
}
}
var subInspectId = this.Grid1.Rows[0].DataKeys[3].ToString();
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == subInspectId);
if (subModel != null)
{
@ -229,6 +308,145 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public string SubSystemId { get; set; }
}
/// <summary>
/// 尾项数据绑定实体
/// </summary>
public class TermItemBridDto
{
/// <summary>
/// 主键
/// </summary>
public string TermItemId { get; set; }
/// <summary>
/// 检查项主键
/// </summary>
public string SubItemId { get; set; }
/// <summary>
/// 检查表主键
/// </summary>
public string SubInspectId { get; set; }
/// <summary>
/// 工作包主键
/// </summary>
public string WorkPackId { get; set; }
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 工作包模板项主键
/// </summary>
public string WorkInspectId { get; set; }
/// <summary>
/// 检查事项名称
/// </summary>
public string WorkInspectName { get; set; }
/// <summary>
/// 装置主键
/// </summary>
public string InstallationId { get; set; }
/// <summary>
/// 工序主键
/// </summary>
public string ProcessesId { get; set; }
/// <summary>
/// 系统主键
/// </summary>
public string SystemId { get; set; }
/// <summary>
/// 子系统主键
/// </summary>
public string SubSystemId { get; set; }
/// <summary>
/// 检查人主键
/// </summary>
public string InspectedUser { get; set; }
/// <summary>
/// 检查结果0:未通过 1:通过
/// </summary>
public int? InspectionResults { get; set; }
/// <summary>
/// 检查说明
/// </summary>
public string InspectionIllustrate { get; set; }
/// <summary>
/// 分包商
/// </summary>
public string Subcontractor { get; set; }
/// <summary>
/// 承包商
/// </summary>
public string Contractor { get; set; }
/// <summary>
/// 监理
/// </summary>
public string Supervision { get; set; }
/// <summary>
/// 业主
/// </summary>
public string Owner { get; set; }
/// <summary>
/// 分包商是否通过0/null:未通过 1:通过
/// </summary>
public int? SubcontractorIsPass { get; set; }
/// <summary>
/// 承包商是否通过0/null:未通过 1:通过
/// </summary>
public int? ContractorIsPass { get; set; }
/// <summary>
/// 监理是否通过0/null:未通过 1:通过
/// </summary>
public int? SupervisionIsPass { get; set; }
/// <summary>
/// 业主是否通过0/null:未通过 1:通过
/// </summary>
public int? OwnerIsPass { get; set; }
/// <summary>
/// 分包商备注
/// </summary>
public string SubcontractorRemark { get; set; }
/// <summary>
/// 承包商备注
/// </summary>
public string ContractorRemark { get; set; }
/// <summary>
/// 监理备注
/// </summary>
public string SupervisionRemark { get; set; }
/// <summary>
/// 业主备注
/// </summary>
public string OwnerRemark { get; set; }
/// <summary>
/// 类型0=全部1=管道2=设备
/// </summary>
public int? WorkPackType { get; set; }
/// <summary>
/// 管道或工艺设备主键
/// </summary>
public string PropertyTechnologyId { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 添加人
/// </summary>
public string AddUser { get; set; }
/// <summary>
/// 添加日期
/// </summary>
public DateTime? AddTime { get; set; }
/// <summary>
/// 排序
/// </summary>
public int? Sort { get; set; }
/// <summary>
/// 是否存在尾项0:不存在1:存在
/// </summary>
public int IsTailTerm { get; set; }
}
/// <summary>
/// 已生成检查表的管道/设备
/// </summary>
@ -280,25 +498,63 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
//尾项申请
if (e.CommandName == "TailTerm")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
if (inspectionResults == 0)
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var tailModel = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TermItemId == termItemId);
if (tailModel != null)
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
}
else
{
JArray mergedData = Grid1.GetMergedData();
var itemRow = mergedData[e.RowIndex].Value<JObject>("values");
if (itemRow.Value<string>("InspectionResults") == "0")
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
}
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", "", termItemId, "新增 - ")));
ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning);
}
}
}
//尾项修改
if (e.CommandName == "TailTermUpdate")
{
var termItemId = Grid1.DataKeys[e.RowIndex][0].ToString();
var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
if (inspectionResults == 0)
{
var tails = Funs.DB.PreRun_InspectTailTerm.Where(x => x.TermItemId == termItemId).ToList();
if (tails.Count > 0)
{
if (tails.Count(x => x.ApproveState == 0) == 0)
{
ShowNotify("申请的尾项非“待提交处理”状态，无法修改！", MessageBoxIcon.Warning);
return;
}
if (tails.Count(x => x.ApproveState == 0) > 1)
{
string window = $"SelectTailTermList.aspx?TermItemId={termItemId}";
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.hidTailTermId.ClientID) + Window2.GetShowReference(window));
}
else
{
var tailModel = tails.FirstOrDefault();
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", tailModel.TailTermId, tailModel.TermItemId, "编辑 - ")));
}
}
else
{
ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("仅未通过检查项才可填写！", MessageBoxIcon.Warning);
ShowNotify("请填写尾项申请！", MessageBoxIcon.Warning);
}
}
}
@ -308,7 +564,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
BindGrid();
BindGrid(true);
}
/// <summary>
@ -316,17 +572,30 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
{
//System.Data.DataRowView row = e.DataItem as System.Data.DataRowView;
//LinkButtonField TailTerm = Grid1.FindColumn("TailTerm") as LinkButtonField;
//var inspectionResults = Grid1.DataKeys[e.RowIndex][2] != null ? int.Parse(Grid1.DataKeys[e.RowIndex][2].ToString()) : -1;
//if (inspectionResults != 0)
//{
// TailTerm.Enabled = true;
//}
//else
//{
// TailTerm.Enabled = false;
//}
var isTailTerm = Grid1.DataKeys[e.RowIndex][4].ToString();
LinkButtonField TailTermUpdate = Grid1.FindColumn("TailTermUpdate") as LinkButtonField;
if (isTailTerm == "0")
{
e.CellCssClasses[TailTermUpdate.ColumnIndex] = "hidethis";
}
}
/// <summary>
/// 尾项选择关闭
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window2_Close(object sender, WindowCloseEventArgs e)
{
if (!string.IsNullOrWhiteSpace(hidTailTermId.Text))
{
var model = Funs.DB.PreRun_InspectTailTerm.FirstOrDefault(x => x.TailTermId == hidTailTermId.Text);
if (model != null)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectTailTermEdit.aspx?TailTermId={0}&TermItemId={1}", hidTailTermId.Text, model.TermItemId, "编辑 - ")));
}
}
}
}
}

18
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs generated
View File

@ -95,6 +95,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// hidTailTermId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hidTailTermId;
/// <summary>
/// txtInspectionIllustrate 控件。
/// </summary>
@ -121,5 +130,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
}
}

2
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx
View File

@ -101,6 +101,8 @@
DataKeyNames="InspectTermId" EnableColumnLines="true" ForceFit="true">
<Columns>
<f:RowNumberField />
<f:RenderField ColumnID="ConstructionUnitName" Width="300px" DataField="ConstructionUnitName" HeaderText="施工单位" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveStateName" Width="100px" DataField="ApproveStateName" HeaderText="处理状态" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ApproveTime" Width="150px" DataField="ApproveTime" HeaderText="处理时间" HeaderTextAlign="Center">

27
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs
View File

@ -155,7 +155,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void gvHandleBrid()
{
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) as ApproveStateName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
string strSql = @"select a.InspectTermId,a.ApproveOpinion,a.ApproveTime,a.ApproveType,a.ApproveState,(case a.ApproveState when 0 then '处理退回' when 1 then '处理通过' else '' end) as ApproveStateName,b.ConstructionUnit,d.UnitName as ConstructionUnitName,a.AddUser,a.AddTime from PreRun_InspectTermApproveRecords as a inner join PreRun_InspectTailTerm as b on a.TailTermId=b.TailTermId inner join PreRun_SubInspectTermItem as c on c.TermItemId=a.TermItemId inner join Base_Unit as d on d.UnitId=b.ConstructionUnit where 1=1 and a.ApproveType=0 and a.ProjectId=@ProjectId and a.TailTermId=@TailTermId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
listStr.Add(new SqlParameter("@TailTermId", this.TailTermId));
@ -221,20 +221,23 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (tailTerm != null)
{
//获取审核项
var termItemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId);
if (termItemModel != null)
if (Funs.DB.PreRun_InspectTailTerm.Count(x => x.TermItemId == tailTerm.TermItemId && x.ApproveState != 5 && x.TailTermId != this.TailTermId) == 0)
{
termItemModel.InspectionResults = 1;
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == termItemModel.SubInspectId);
if (subModel != null)
var termItemModel = Funs.DB.PreRun_SubInspectTermItem.FirstOrDefault(x => x.TermItemId == tailTerm.TermItemId);
if (termItemModel != null)
{
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == termItemModel.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1 && x.TermItemId != termItemModel.TermItemId) == 0)
termItemModel.InspectionResults = 1;
var subModel = Funs.DB.PreRun_SubInspectTerm.FirstOrDefault(x => x.SubInspectId == termItemModel.SubInspectId);
if (subModel != null)
{
subModel.InspectionIsAllPass = 1;
}
else
{
subModel.InspectionIsAllPass = 0;
if (Funs.DB.PreRun_SubInspectTermItem.Count(x => x.SubInspectId == termItemModel.SubInspectId && x.InspectionResults.GetValueOrDefault() != 1 && x.TermItemId != termItemModel.TermItemId) == 0)
{
subModel.InspectionIsAllPass = 1;
}
else
{
subModel.InspectionIsAllPass = 0;
}
}
}
}

6
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUpload.aspx.cs
View File

@ -82,7 +82,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
join f in Funs.DB.Sys_User on a.Supervision equals f.UserId
join g in Funs.DB.Sys_User on a.Owner equals g.UserId
join h in Funs.DB.Base_Project on a.ProjectId equals h.ProjectId
join i in Funs.DB.Sys_User on a.SiteImplementUser equals i.UserId
where a.SubInspectId == this.SubInspectId
select new
{
@ -107,9 +109,9 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
a.InspectIsClose,
a.InspectCloseData
};
if (data != null)
var inspectTermModel = data.FirstOrDefault();
if (inspectTermModel != null)
{
var inspectTermModel = data.FirstOrDefault();
lblProjectName.Text = inspectTermModel.ProjectName;
lblProjectCode.Text = inspectTermModel.ProjectCode;
lblWorkPackTypeName.Text = inspectTermModel.WorkPackTypeName;

4
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx
View File

@ -103,9 +103,9 @@
</f:RenderField>
<f:RenderField ColumnID="OwnerName" DataField="OwnerName" HeaderText="业主" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="InspectIsCloseName" DataField="InspectIsCloseName" HeaderText="检查表是否关闭" HeaderTextAlign="Center" TextAlign="Center">
<f:RenderField ColumnID="InspectIsCloseName" DataField="InspectIsCloseName" HeaderText="任务单是否关闭" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:BoundField DataField="InspectCloseData" DataFormatString="{0:yyyy-MM-dd}" HeaderText="检查表关闭日期" />
<f:BoundField DataField="InspectCloseData" DataFormatString="{0:yyyy-MM-dd}" HeaderText="任务单关闭日期" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

72
SGGL/Model/Model.cs
View File

@ -264039,6 +264039,12 @@ namespace Model
private System.Nullable<System.DateTime> _InspectCloseData;
private System.Nullable<int> _IsUnifyWanderAbout;
private System.Nullable<System.DateTime> _UnifyWanderAboutData;
private string _UnifyWanderAboutOpinion;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -264113,6 +264119,12 @@ namespace Model
partial void OnInspectIsCloseUserChanged();
partial void OnInspectCloseDataChanging(System.Nullable<System.DateTime> value);
partial void OnInspectCloseDataChanged();
partial void OnIsUnifyWanderAboutChanging(System.Nullable<int> value);
partial void OnIsUnifyWanderAboutChanged();
partial void OnUnifyWanderAboutDataChanging(System.Nullable<System.DateTime> value);
partial void OnUnifyWanderAboutDataChanged();
partial void OnUnifyWanderAboutOpinionChanging(string value);
partial void OnUnifyWanderAboutOpinionChanged();
#endregion
public PreRun_SubInspectTerm()
@ -264820,6 +264832,66 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUnifyWanderAbout", DbType="Int")]
public System.Nullable<int> IsUnifyWanderAbout
{
get
{
return this._IsUnifyWanderAbout;
}
set
{
if ((this._IsUnifyWanderAbout != value))
{
this.OnIsUnifyWanderAboutChanging(value);
this.SendPropertyChanging();
this._IsUnifyWanderAbout = value;
this.SendPropertyChanged("IsUnifyWanderAbout");
this.OnIsUnifyWanderAboutChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutData", DbType="DateTime")]
public System.Nullable<System.DateTime> UnifyWanderAboutData
{
get
{
return this._UnifyWanderAboutData;
}
set
{
if ((this._UnifyWanderAboutData != value))
{
this.OnUnifyWanderAboutDataChanging(value);
this.SendPropertyChanging();
this._UnifyWanderAboutData = value;
this.SendPropertyChanged("UnifyWanderAboutData");
this.OnUnifyWanderAboutDataChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnifyWanderAboutOpinion", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string UnifyWanderAboutOpinion
{
get
{
return this._UnifyWanderAboutOpinion;
}
set
{
if ((this._UnifyWanderAboutOpinion != value))
{
this.OnUnifyWanderAboutOpinionChanging(value);
this.SendPropertyChanging();
this._UnifyWanderAboutOpinion = value;
this.SendPropertyChanged("UnifyWanderAboutOpinion");
this.OnUnifyWanderAboutOpinionChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;