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

提交试车代码

Browse Source
This commit is contained in:
高飞
2023-11-23 09:28:55 +08:00
parent 5e5ad08320
commit 88d09e2602
66 changed files with 10754 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx
+24 -2
View File
@@ -41,9 +41,9 @@
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RunLevelName" DataField="RunLevelName" HeaderText="类型">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" HeaderText="描述">
<f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" HeaderText="描述">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Sort" DataField="Sort" HeaderText="排序">
<f:RenderField Width="100px" ColumnID="Sort" DataField="Sort" HeaderText="排序">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="OperateTime" DataField="OperateTime" HeaderText="操作日期" FieldType="Date"
Renderer="Date" RendererArgument="yyyy-MM-dd">
@@ -51,6 +51,9 @@
<f:LinkButtonField Width="100px" ConfirmText="删除当前选中数据和所有子节点数据？" ConfirmTarget="Top"
CommandName="Delete" Icon="Delete" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
</f:Grid>
</Items>
</f:Panel>
@@ -58,6 +61,25 @@
Target="Parent" EnableResize="true" runat="server" IsModal="true" OnClose="Window1_Close" CloseAction="HidePostBack"
Width="800px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil"
OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuParentAdd" EnablePostBack="true" runat="server" Text="新增子级别" Icon="ApplicationViewIcons"
OnClick="btnMenuParentAdd_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>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.cs
+32 -1
View File
@@ -171,6 +171,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
string IsXls = Path.GetExtension(this.fileData.FileName).ToString().Trim().ToLower();
if (IsXls != ".xls" && IsXls != ".xlsx")
{
this.fileData.Reset();
ShowNotify("excel文件类型错误!", MessageBoxIcon.Warning);
return;
}
@@ -192,6 +193,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out string message, false);
if (ds == null)
{
this.fileData.Reset();
ShowNotify("模板错误，请从系统下载正确的模板！", MessageBoxIcon.Warning);
return;
}
@@ -205,6 +207,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var fileVerify = VerifyFile(ds);
if (!fileVerify)
{
this.fileData.Reset();
ShowNotify("请获取正确模板!", MessageBoxIcon.Warning);
return;
}
@@ -221,6 +224,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
if (StrIsNumm(item[0]) || StrIsNumm(item[1]))
{
this.fileData.Reset();
ShowNotify($"{index}行装置编码或名称为空！", MessageBoxIcon.Warning);
break;
}
@@ -267,7 +271,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
this.fileData.Reset();
ShowNotify($"{index}行数据存在错误，数据格式具体见模板说明为空！", MessageBoxIcon.Warning);
break;
}
@@ -284,6 +288,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var importCodes = installationCodes.GroupBy(x => x).Where(x => x.Count() > 1).Select(x => x.Key).ToList();
if (importCodes.Count > 0)
{
this.fileData.Reset();
ShowNotify($"EXCEL中装置编码{string.Join(",", importCodes)}重复，请调整模板数据！", MessageBoxIcon.Warning);
return;
}
@@ -293,6 +298,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var existInstallations = Funs.DB.PreRun_SysDevice.Where(a => installationCodes.Contains(a.PreRunCode) && a.PreRunLevel == 1 && a.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (existInstallations.Count > 0)
{
this.fileData.Reset();
ShowNotify($"装置编码({string.Join(",", existInstallations.ConvertAll(s => s.PreRunCode))})已存在!", MessageBoxIcon.Warning);
return;
}
@@ -306,6 +312,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var importCodes = processesCodes.GroupBy(x => x).Where(x => x.Count() > 1).Select(x => x.Key).ToList();
if (importCodes.Count > 0)
{
this.fileData.Reset();
ShowNotify($"EXCEL中工序编码{string.Join(",", importCodes)}重复，请调整模板数据！", MessageBoxIcon.Warning);
return;
}
@@ -315,6 +322,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var existProcessess = Funs.DB.PreRun_SysDevice.Where(a => processesCodes.Contains(a.PreRunCode) && a.PreRunLevel == 2 && a.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (existProcessess.Count > 0)
{
this.fileData.Reset();
ShowNotify($"工序编码({string.Join(",", existProcessess.ConvertAll(s => s.PreRunCode))})已存在!", MessageBoxIcon.Warning);
return;
}
@@ -327,6 +335,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var importCodes = systemCodes.GroupBy(x => x).Where(x => x.Count() > 1).Select(x => x.Key).ToList();
if (importCodes.Count > 0)
{
this.fileData.Reset();
ShowNotify($"EXCEL中系统编码{string.Join(",", importCodes)}重复，请调整模板数据！", MessageBoxIcon.Warning);
return;
}
@@ -336,6 +345,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var existSystems = Funs.DB.PreRun_SysDevice.Where(a => systemCodes.Contains(a.PreRunCode) && a.PreRunLevel == 3 && a.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (existSystems.Count > 0)
{
this.fileData.Reset();
ShowNotify($"系统编码({string.Join(",", existSystems.ConvertAll(s => s.PreRunCode))})已存在!", MessageBoxIcon.Warning);
return;
}
@@ -348,6 +358,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var importCodes = subsystemCodes.GroupBy(x => x).Where(x => x.Count() > 1).Select(x => x.Key).ToList();
if (importCodes.Count > 0)
{
this.fileData.Reset();
ShowNotify($"EXCEL中子系统编码{string.Join(",", importCodes)}重复，请调整模板数据！", MessageBoxIcon.Warning);
return;
}
@@ -357,6 +368,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
var existSubsystems = Funs.DB.PreRun_SysDevice.Where(a => subsystemCodes.Contains(a.PreRunCode) && a.PreRunLevel == 4 && a.ProjectId == this.CurrUser.LoginProjectId).ToList();
if (existSubsystems.Count > 0)
{
this.fileData.Reset();
ShowNotify($"子系统编码({string.Join(",", existSubsystems.ConvertAll(s => s.PreRunCode))})已存在!", MessageBoxIcon.Warning);
return;
}
@@ -551,12 +563,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
else
{
this.fileData.Reset();
ShowNotify("文件无数据!", MessageBoxIcon.Warning);
}
DataBrid();
this.fileData.Reset();
}
catch (Exception ex)
{
this.fileData.Reset();
ShowNotify(ex.Message, MessageBoxIcon.Warning);
}
}
@@ -592,6 +607,22 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
}
}
/// <summary>
/// 右击修改
/// </summary>
protected void btnMenuModify_Click(object sender, EventArgs e)
{
btnEdit_Click(sender, e);
}
/// <summary>
/// 右击新增子级别
/// </summary>
protected void btnMenuParentAdd_Click(object sender, EventArgs e)
{
btnParentAdd_Click(sender, e);
}
#endregion
#region 私有方法
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRun.aspx.designer.cs
Generated
+27
View File
@@ -148,5 +148,32 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuModify;
/// <summary>
/// btnMenuParentAdd 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuParentAdd;
}
}
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/DeviceRunEdit.aspx.cs
+1
View File
@@ -28,6 +28,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
get { return (string)ViewState["RunId"]; }
set { ViewState["RunId"] = value; }
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx
+6 -6
View File
@@ -98,7 +98,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Required="true" EnableEdit="false" Label="整改完成时间" LabelWidth="150px" EmptyText="请选择日期"
<f:DatePicker runat="server" Required="true" EnableEdit="false" Label="要求整改完成时间" LabelWidth="150px" EmptyText="请选择日期"
ID="txtAdjustCompleteTime" ShowRedStar="true">
</f:DatePicker>
</Items>
@@ -107,21 +107,21 @@
<Items>
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="问题图片：" CssStyle="padding-left:25px" Width="120px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片" ToolTip="上传及查看" Icon="TableCell" runat="server"
<f:Label runat="server" Text="问题图片上传：" CssStyle="padding-left:25px" Width="150px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片上传" ToolTip="问题图片上传" Icon="TableCell" runat="server"
OnClick="imgBtnQuestionFile_Click">
</f:Button>
</Items>
</f:Panel>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<%--<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="120px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片：">
</f:Label>
<f:Button ID="imgBtnRectifyFile" Text="整改图片" ToolTip="上传及查看" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
<f:Button ID="imgBtnRectifyFile" Text="整改图片" ToolTip="查看" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
</f:Button>
</Items>
</f:Panel>
</f:Panel>--%>
</Items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.cs
+18 -18
View File
@@ -49,14 +49,14 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
set { ViewState["QuestionEditImg"] = value; }
}
/// <summary>
/// 整改图片是否可编辑
/// </summary>
public int RectifyEditImg
{
get { return (int)ViewState["RectifyEditImg"]; }
set { ViewState["RectifyEditImg"] = value; }
}
///// <summary>
///// 整改图片是否可编辑
///// </summary>
//public int RectifyEditImg
//{
// get { return (int)ViewState["RectifyEditImg"]; }
// set { ViewState["RectifyEditImg"] = value; }
//}
protected void Page_Load(object sender, EventArgs e)
{
@@ -76,7 +76,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
btnSave.Hidden = true;
btnSubmit.Hidden = true;
QuestionEditImg = -1;
RectifyEditImg = -1;
//RectifyEditImg = -1;
txtTailTermCode.Enabled = false;
ddlConstructionUnit.Enabled = false;
ddlProblemType.Enabled = false;
@@ -96,7 +96,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public void PageInit()
{
QuestionEditImg = 0;
RectifyEditImg = 0;
//RectifyEditImg = -1;
var selectList = new List<SelectPropertyTechnology>();
//施工单位
UnitService.InitUnitByProjectIdUnitTypeDropDownList(ddlConstructionUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false);
@@ -233,7 +233,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (model.ApproveState > 1)
{
QuestionEditImg = -1;
RectifyEditImg = -1;
//RectifyEditImg = -1;
}
}
else
@@ -467,13 +467,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", QuestionEditImg, this.TailTermId + "q", Const.InspectTailTerm)));
}
/// <summary>
/// 整改图片
/// </summary>
protected void imgBtnRectifyFile_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm)));
}
///// <summary>
///// 整改图片
///// </summary>
//protected void imgBtnRectifyFile_Click(object sender, EventArgs e)
//{
// PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/CheckControl&menuId={2}", RectifyEditImg, this.TailTermId + "h", Const.InspectTailTerm)));
//}
#endregion
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermEdit.aspx.designer.cs
Generated
-27
View File
@@ -203,33 +203,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Button imgBtnQuestionFile;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// lblAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblAttach;
/// <summary>
/// imgBtnRectifyFile 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button imgBtnRectifyFile;
/// <summary>
/// plApprove2 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTailTermList.aspx
-1
View File
@@ -159,7 +159,6 @@
</f:DropDownList>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
</PageItems>
</f:Grid>
</Items>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx
+4 -4
View File
@@ -27,17 +27,17 @@
</f:Tree>
</Items>
</f:Panel>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="WorkInspectId" DataKeyNames="WorkInspectId,WorkPackId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="15" AllowFilters="true" OnPageIndexChange="Grid1_PageIndexChange" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand" ClicksToEdit="1">
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" EnableCollapse="true" runat="server" DataIDField="WorkInspectId" DataKeyNames="WorkInspectId,WorkPackId" AllowSorting="true" SortField="Sort" SortDirection="ASC" EnableColumnLines="true" AllowCellEditing="true" EnableMultiSelect="false" AllowPaging="true" IsDatabasePaging="true" PageSize="15" AllowFilters="true" OnPageIndexChange="Grid1_PageIndexChange" OnSort="Grid1_Sort" OnRowCommand="Grid1_RowCommand" ClicksToEdit="1">
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:TextBox runat="server" ID="txtsWorkInspectName"></f:TextBox>
<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>
<f:TextBox runat="server" Label="名称" LabelAlign="Right" ID="txtsWorkInspectName"></f:TextBox>
<f:Button ID="btnSearch" Icon="SystemSearch" Text="搜索" ToolTip="搜索" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill" runat="server"></f:ToolbarFill>
<f:Button ID="btnAdd" ToolTip="新增" Text="新增" Icon="Add" runat="server" OnClick="btnAdd_Click"></f:Button>
<f:Button ID="btnEdit" ToolTip="编辑" Text="编辑" Icon="ApplicationEdit" runat="server" OnClick="btnEdit_Click"></f:Button>
<f:Button ID="btnSave" Text="保存" ToolTip="保存" Icon="FilmSave" runat="server" OnClick="btnSave_Click"></f:Button>
<f:HiddenField runat="server" ID="hidSelectedNodeID"></f:HiddenField>
<f:TextBox runat="server" ID="hidSelectedNodeID" Hidden="true"></f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.cs
-1
View File
@@ -106,7 +106,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// <summary>
/// 排序
/// </summary>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
Grid1.SortDirection = e.SortDirection;
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectTemplate.aspx.designer.cs
Generated
+1 -1
View File
@@ -138,7 +138,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hidSelectedNodeID;
protected global::FineUIPro.TextBox hidSelectedNodeID;
/// <summary>
/// txtWorkInspectName 控件。
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPass.aspx
+1 -1
View File
@@ -66,7 +66,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtUnifyWanderAboutOpinion" ShowRedStar="true" Required="true" runat="server" Label="审核意见" MaxLength="3000"></f:TextArea>
<f:TextArea ID="txtUnifyWanderAboutOpinion" ShowRedStar="true" Required="true" runat="server" Label="备注" MaxLength="3000"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx.cs
+1 -1
View File
@@ -250,7 +250,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
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();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId) && x.InspectionIsAllPass == 1).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/InspectWanderAboutList.aspx.cs
+1 -1
View File
@@ -270,7 +270,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
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();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId)&& (x.Subcontractor == this.CurrUser.UserId && x.InspectionIsAllPass == 1) || (x.Contractor == this.CurrUser.UserId && x.ContractorIsAllPass == 1) || (x.Supervision == this.CurrUser.UserId && x.SupervisionIsAllPass == 1) || (x.Owner == this.CurrUser.UserId && x.OwnerIsAllPass == 1)).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx
+17 -3
View File
@@ -30,6 +30,12 @@
<f:RenderField Width="260px" ColumnID="WorkPackName" DataField="WorkPackName" FieldType="String"
HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left" SortField="WorkPackName">
</f:RenderField>
<f:RenderField Width="260px" ColumnID="WorkPackTypeName" DataField="WorkPackTypeName" FieldType="String"
HeaderText="类型" HeaderTextAlign="Center" TextAlign="Left" SortField="WorkPackType">
</f:RenderField>
<f:RenderField Width="260px" ColumnID="WorkPackType" DataField="WorkPackType" FieldType="String"
HeaderText="类型" HeaderTextAlign="Center" TextAlign="Left" SortField="WorkPackType" Hidden="true">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="Remark" DataField="Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
@@ -54,11 +60,16 @@
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="100px" BodyPadding="5px" Width="310px">
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="hfFormID" runat="server" Hidden="true">
</f:TextBox>
<f:TextBox ID="txtWorkPackName" Label="名称" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
<f:DropDownList runat="server" ID="ddlWorkPackType" Label="工作包类型">
<f:ListItem Text="全部" Value="0" />
<f:ListItem Text="管道" Value="1" />
<f:ListItem Text="设备" Value="2" />
</f:DropDownList>
<f:TextArea ID="txtRemark" Label="备注" runat="server" LabelAlign="right" Height="64px">
</f:TextArea>
</Items>
@@ -111,8 +122,9 @@
var formClientID = '<%= SimpleForm1.ClientID %>';
var hfFormIDClientID = '<%= hfFormID.ClientID %>';
var txtWorkPackNameClientID = '<%= txtWorkPackName.ClientID %>';
var txtWorkPackNameClientID = '<%= txtWorkPackName.ClientID %>';
var txtRemarkClientID = '<%= txtRemark.ClientID %>';
var ddlWorkPackTypeClientID = '<%= ddlWorkPackType.ClientID %>';
function onGridRowSelect(event, rowId) {
@@ -121,6 +133,7 @@
// 启用删除按钮
F(btnDeleteClientID).enable();
debugger;
// 当前行数据
var rowValue = grid.getRowValue(rowId);
@@ -128,6 +141,7 @@
F(hfFormIDClientID).setValue(rowId);
F(txtWorkPackNameClientID).setValue(rowValue['WorkPackName']);
F(txtRemarkClientID).setValue(rowValue['Remark']);
F(ddlWorkPackTypeClientID).setValue(rowValue['WorkPackType']);
// 更新提交按钮文本
F(btnSaveClientID).setText('提交数据（编辑）');
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.cs
+3 -2
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
}
}
@@ -30,7 +29,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
private void BindGrid()
{
string strSql = @"select WorkPackId,WorkPackName,Remark,AddTime,Sort from PreRun_WorkPackage WHERE 1=1 ";
string strSql = @"select WorkPackId,WorkPackName,WorkPackType,(case WorkPackType when 1 then '管道' when 2 then '设备' else '全部' end) as WorkPackTypeName,Remark,AddTime,Sort from PreRun_WorkPackage WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtsWorkPackName.Text.Trim()))
{
@@ -222,6 +221,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
PreRun_WorkPackage model = new PreRun_WorkPackage();
model.WorkPackId = Guid.NewGuid().ToString();
model.WorkPackName = this.txtWorkPackName.Text.Trim();
model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
model.Remark = this.txtRemark.Text.Trim();
Funs.DB.PreRun_WorkPackage.InsertOnSubmit(model);
Funs.DB.SubmitChanges();
@@ -233,6 +233,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
model.WorkPackName = this.txtWorkPackName.Text.Trim();
model.Remark = this.txtRemark.Text.Trim();
model.WorkPackType = int.Parse(ddlWorkPackType.SelectedValue);
Funs.DB.SubmitChanges();
}
}
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SetWorkPackage.aspx.designer.cs
Generated
+10 -1
View File
@@ -111,7 +111,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hfFormID;
protected global::FineUIPro.TextBox hfFormID;
/// <summary>
/// txtWorkPackName 控件。
@@ -122,6 +122,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.TextBox txtWorkPackName;
/// <summary>
/// ddlWorkPackType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWorkPackType;
/// <summary>
/// txtRemark 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx
+2
View File
@@ -102,6 +102,8 @@
<f:RenderField ColumnID="SupervisionName" DataField="SupervisionName" HeaderText="监理" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="OwnerName" DataField="OwnerName" HeaderText="业主" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsWanderAboutPassName" DataField="IsWanderAboutPassName" HeaderText="检查表会签" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsSiteImplementName" DataField="IsSiteImplementName" HeaderText="现场实施是否完成" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SiteImplementationList.aspx.cs
+2 -2
View File
@@ -128,7 +128,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
public void BindGrid()
{
List<SqlParameter> listStr = new List<SqlParameter>();
string sqlStr = $"select a.SubInspectId,a.ProjectId,g.ProjectName,g.ProjectCode,a.WorkPackId,b.WorkPackName,a.WorkPackType,a.SubSystemId,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,c.UserName as SubcontractorName,d.UserName as ContractorName,e.UserName as SupervisionName,f.UserName as OwnerName,(case a.WorkPackType when 1 then (select a.pkidStr from (SELECT STUFF(( SELECT ',' +convert(VARCHAR, PipingCode) FROM (select proper.PipingCode from PreRun_PropertySysPiping as proper where proper.PropertyId in (select Id from StrToTable(a.PropertyTechnologyId)))t FOR XML PATH('')), 1, 1, '') AS pkidStr) a) else (select a.pkidStr from (SELECT STUFF(( SELECT ',' +convert(VARCHAR, TagNumber) FROM (select technolog.TagNumber from PreRun_TechnologySysPiping as technolog where technolog.TechnologyId in (select Id from StrToTable(a.PropertyTechnologyId)))t FOR XML PATH('')), 1, 1, '') AS pkidStr) a) end) as CodeStr,a.IsSiteImplement,(case a.IsSiteImplement when 1 then '已完成' else '未完成' end) as IsSiteImplementName,a.SiteImplementConfirmData,a.AddTime from PreRun_SubInspectTerm as a left join PreRun_WorkPackage as b on a.WorkPackId=b.WorkPackId left join Sys_User as c on c.UserId=a.Subcontractor left join Sys_User as d on d.UserId=a.Contractor left join Sys_User as e on e.UserId=a.Supervision left join Sys_User as f on f.UserId=a.Owner left join Base_Project as g on g.ProjectId=a.ProjectId where 1=1 and a.ProjectId=@projectid ";
string sqlStr = $"select a.SubInspectId,a.ProjectId,g.ProjectName,g.ProjectCode,a.WorkPackId,b.WorkPackName,a.WorkPackType,a.SubSystemId,(case a.WorkPackType when 1 then '管道' else '设备' end) as WorkPackTypeName,c.UserName as SubcontractorName,d.UserName as ContractorName,e.UserName as SupervisionName,f.UserName as OwnerName,(case a.WorkPackType when 1 then (select a.pkidStr from (SELECT STUFF(( SELECT ',' +convert(VARCHAR, PipingCode) FROM (select proper.PipingCode from PreRun_PropertySysPiping as proper where proper.PropertyId in (select Id from StrToTable(a.PropertyTechnologyId)))t FOR XML PATH('')), 1, 1, '') AS pkidStr) a) else (select a.pkidStr from (SELECT STUFF(( SELECT ',' +convert(VARCHAR, TagNumber) FROM (select technolog.TagNumber from PreRun_TechnologySysPiping as technolog where technolog.TechnologyId in (select Id from StrToTable(a.PropertyTechnologyId)))t FOR XML PATH('')), 1, 1, '') AS pkidStr) a) end) as CodeStr,a.IsSiteImplement,(case a.IsSiteImplement when 1 then '已完成' else '未完成' end) as IsSiteImplementName,(case when (a.SubcontractorIsAllPass=1 and a.ContractorIsAllPass=1 and a.SupervisionIsAllPass=1 and a.OwnerIsAllPass=1) then '已完成' else '未完成' end) as IsWanderAboutPassName,a.SiteImplementConfirmData,a.AddTime from PreRun_SubInspectTerm as a left join PreRun_WorkPackage as b on a.WorkPackId=b.WorkPackId left join Sys_User as c on c.UserId=a.Subcontractor left join Sys_User as d on d.UserId=a.Contractor left join Sys_User as e on e.UserId=a.Supervision left join Sys_User as f on f.UserId=a.Owner left join Base_Project as g on g.ProjectId=a.ProjectId where 1=1 and a.ProjectId=@projectid ";
listStr.Add(new SqlParameter("@projectid", this.CurrUser.LoginProjectId));
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 0)
@@ -294,7 +294,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
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();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId) && x.InspectionIsAllPass == 1 && x.WanderIsComplete == 1).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubInspectTerm.aspx.cs
+14 -17
View File
@@ -285,23 +285,20 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
int index = list.Count + 1;
foreach (var item in defaultDatas)
{
if (list.Count(x => x.WorkInspectName == item.WorkInspectName) == 0)
{
var model = new PreRun_SubInspectTermItem();
model.TermItemId = Guid.NewGuid().ToString();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
model.WorkInspectId = item.WorkInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InstallationId = subSysModel.InstallationId;
model.ProcessesId = subSysModel.ProcessesId;
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
result.Add(model);
index++;
}
var model = new PreRun_SubInspectTermItem();
model.TermItemId = Guid.NewGuid().ToString();
model.SubItemId = Guid.NewGuid().ToString();
model.ProjectId = this.CurrUser.LoginProjectId;
model.WorkPackId = item.WorkPackId;
model.WorkInspectId = item.WorkInspectId;
model.WorkInspectName = item.WorkInspectName;
model.InstallationId = subSysModel.InstallationId;
model.ProcessesId = subSysModel.ProcessesId;
model.SystemId = subSysModel.SystemId;
model.SubSystemId = subSysModel.PreRunId;
model.Sort = index + 1;
result.Add(model);
index++;
}
}
}
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx
+1
View File
@@ -35,6 +35,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" runat="server">
<Items>
<f:Label runat="server" ID="lblCodeStr"></f:Label>
<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>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.cs
+5
View File
@@ -135,6 +135,11 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
if (this.tvControlItem.SelectedNodeID.Split('|').Length > 2)
{
subInspectId = this.tvControlItem.SelectedNodeID.Split('|').Last();
lblCodeStr.Text = this.tvControlItem.SelectedNode.ToolTip;
}
else
{
lblCodeStr.Text = string.Empty;
}
//获取子系统
var data = from termitem in Funs.DB.PreRun_SubInspectTermItem
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/SubWorkInspect.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lblCodeStr 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblCodeStr;
/// <summary>
/// ToolbarFill 控件。
/// </summary>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx
+8 -8
View File
@@ -55,8 +55,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblSubInspectId" runat="server" Label="管道/设备" LabelAlign="Right"></f:Label>
<f:Label ID="lblTermItemId" runat="server" Label="检查项" LabelAlign="Right"></f:Label>
<f:Label ID="lblSubInspectName" runat="server" Label="管道号/设备位号" LabelAlign="Right"></f:Label>
<f:Label ID="lblTermItemName" runat="server" Label="检查项" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -68,25 +68,25 @@
<f:FormRow>
<Items>
<f:Label ID="lblInspectUser" runat="server" Label="检查人" LabelAlign="Right"></f:Label>
<f:Label ID="lblRectifyTime" runat="server" Label="整改时间" LabelAlign="Right"></f:Label>
<f:Label ID="lblAdjustCompleteTime" runat="server" Label="要求整改完成时间" LabelWidth="150px" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="问题图片：" CssStyle="padding-left:25px" Width="120px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片" ToolTip="上传及查看" Icon="TableCell" runat="server"
<f:Label runat="server" Text="问题图片查看：" CssStyle="padding-left:25px" Width="150px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片查看" ToolTip="问题图片查看" Icon="TableCell" runat="server"
OnClick="imgBtnQuestionFile_Click">
</f:Button>
</Items>
</f:Panel>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="120px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片：">
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="150px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片查看：">
</f:Label>
<f:Button ID="imgBtnRectifyFile" Text="整改图片" ToolTip="上传及查看" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
<f:Button ID="imgBtnRectifyFile" Text="整改图片查看" ToolTip="整改图片查看" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
</f:Button>
</Items>
</f:Panel>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.cs
+13 -30
View File
@@ -59,28 +59,6 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
/// </summary>
public void PageInit()
{
////获取用户信息
//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;
//var userids = new List<string>() { Const.sysglyId, Const.hfnbdId, Const.sedinId };
//var addUserList = Funs.DB.Sys_User.Where(x => userids.Contains(x.UserId));
//var users = userList.ToList();
//if (addUserList.Count() > 0)
//{
// users.AddRange(addUserList);
//}
//if (users.Count() > 0)
//{
// ddlApproveUser.DataTextField = "UserName";
// ddlApproveUser.DataValueField = "UserId";
// ddlApproveUser.DataSource = users;
// ddlApproveUser.DataBind();
//}
//txtApproveTime.Text = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss");
//ddlApproveUser.SelectedValue = this.CurrUser.UserId;
var data = from tail in Funs.DB.PreRun_InspectTailTerm
join unit in Funs.DB.Base_Unit on tail.ConstructionUnit equals unit.UnitId
join inspuser in Funs.DB.Sys_User on tail.InspectUser equals inspuser.UserId
@@ -102,6 +80,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
InspectUserName = inspuser.UserName,
tail.ApproveUser,
ApproveUserName = approuser.UserName,
termitem.PropertyTechnologyId,
tail.AdjustCompleteTime
};
if (data.Count() > 0)
@@ -116,30 +96,33 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//问题类别
lblProblemType.Text = model.ProblemType == 1 ? "管道" : "设备";
//管道/设备
var propertyIds = model.PropertyTechnologyId.Split(',');
if (model.ProblemType == 1)
{
var piping = Funs.DB.PreRun_PropertySysPiping.FirstOrDefault(x => x.PropertyId == model.SubInspectId);
lblSubInspectName.Label = "管道号";
var piping = Funs.DB.PreRun_PropertySysPiping.Where(x => propertyIds.Contains(x.PropertyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"管道：{piping.PipingCode}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.PipingCode))}";
}
}
else
{
var piping = Funs.DB.PreRun_TechnologySysPiping.FirstOrDefault(x => x.TechnologyId == model.SubInspectId);
lblSubInspectName.Label = "设备位号";
var piping = Funs.DB.PreRun_TechnologySysPiping.Where(x => propertyIds.Contains(x.TechnologyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"设备：{piping.TagNumber}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.TagNumber))}";
}
}
//检查项
lblTermItemId.Text = model.TermItemName;
lblTermItemName.Text = model.TermItemName;
//问题描述
lblQuestionDesc.Text = model.QuestionDesc;
//整改意见
lblRectifyOpinion.Text = model.RectifyOpinion;
//整改时间
lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//要求整改完成时间
lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//检查人
lblInspectUser.Text = model.InspectUserName;
//审核人
@@ -155,7 +138,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,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 ";
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));
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermApprove.aspx.designer.cs
Generated
+6 -6
View File
@@ -96,22 +96,22 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.Label lblProblemType;
/// <summary>
/// lblSubInspectId 控件。
/// lblSubInspectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSubInspectId;
protected global::FineUIPro.Label lblSubInspectName;
/// <summary>
/// lblTermItemId 控件。
/// lblTermItemName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblTermItemId;
protected global::FineUIPro.Label lblTermItemName;
/// <summary>
/// lblQuestionDesc 控件。
@@ -141,13 +141,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.Label lblInspectUser;
/// <summary>
/// lblRectifyTime 控件。
/// lblAdjustCompleteTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblRectifyTime;
protected global::FineUIPro.Label lblAdjustCompleteTime;
/// <summary>
/// Panel1 控件。
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandle.aspx
+11 -11
View File
@@ -35,7 +35,7 @@
<Rows>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel1" Title="巡检审核" ShowBorder="true"
<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"
@@ -55,8 +55,8 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="lblSubInspectId" runat="server" Label="管道/设备" LabelAlign="Right"></f:Label>
<f:Label ID="lblTermItemId" runat="server" Label="检查项" LabelAlign="Right"></f:Label>
<f:Label ID="lblSubInspectName" runat="server" Label="管道号/设备位号" LabelAlign="Right"></f:Label>
<f:Label ID="lblTermItemName" runat="server" Label="检查项" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -68,25 +68,25 @@
<f:FormRow>
<Items>
<f:Label ID="lblInspectUser" runat="server" Label="检查人" LabelAlign="Right"></f:Label>
<f:Label ID="lblRectifyTime" runat="server" Label="整改时间" LabelAlign="Right"></f:Label>
<f:Label ID="lblAdjustCompleteTime" runat="server" Label="要求整改完成时间" LabelWidth="150px" LabelAlign="Right"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="问题图片：" CssStyle="padding-left:25px" Width="120px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片" ToolTip="上传及查看" Icon="TableCell" runat="server"
<f:Label runat="server" Text="问题图片查看：" CssStyle="padding-left:25px" Width="150px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnQuestionFile" Text="问题图片查看" ToolTip="问题图片查看" Icon="TableCell" runat="server"
OnClick="imgBtnQuestionFile_Click">
</f:Button>
</Items>
</f:Panel>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="120px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片：">
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="150px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片上传：">
</f:Label>
<f:Button ID="imgBtnRectifyFile" Text="整改图片" ToolTip="上传及查看" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
<f:Button ID="imgBtnRectifyFile" Text="整改图片上传" ToolTip="整改图片上传" Icon="TableCell" runat="server" OnClick="imgBtnRectifyFile_Click">
</f:Button>
</Items>
</f:Panel>
@@ -101,7 +101,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtApproveOpinion" ShowRedStar="true" Required="true" runat="server" Label="处理意见" MaxLength="3000"></f:TextArea>
<f:TextArea ID="txtApproveOpinion" ShowRedStar="true" Required="true" runat="server" Label="处理结果" MaxLength="3000"></f:TextArea>
</Items>
</f:FormRow>
</Rows>
@@ -117,7 +117,7 @@
</f:ToolbarFill>
<f:Button ID="btnReturn" Icon="SystemSave" runat="server" Text="处理退回" ToolTip="处理退回" ValidateForms="SimpleForm1" OnClick="btnReturn_Click">
</f:Button>
<f:Button ID="btnPass" Icon="SystemSaveNew" runat="server" Text="处理通过并提交审核" ToolTip="处理通过并提交审核" ValidateForms="SimpleForm1" OnClick="btnPass_Click">
<f:Button ID="btnPass" Icon="SystemSaveNew" runat="server" Text="处理完成并提交审核" ToolTip="处理完成并提交审核" ValidateForms="SimpleForm1" OnClick="btnPass_Click">
</f:Button>
</Items>
</f:Toolbar>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandle.aspx.cs
+13 -8
View File
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
this.TailTermId = Request["TailTermId"];
this.QuestionEditImg = -1;
this.RectifyEditImg = -1;
this.RectifyEditImg = 0;
//数据绑定
PageInit();
}
@@ -77,6 +77,8 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
InspectUserName = inspuser.UserName,
tail.HandleUser,
HandleUserName = handleuser.UserName,
termitem.PropertyTechnologyId,
tail.AdjustCompleteTime
};
if (data.Count() > 0)
{
@@ -90,30 +92,33 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
//问题类别
lblProblemType.Text = model.ProblemType == 1 ? "管道" : "设备";
//管道/设备
var propertyIds = model.PropertyTechnologyId.Split(',');
if (model.ProblemType == 1)
{
var piping = Funs.DB.PreRun_PropertySysPiping.FirstOrDefault(x => x.PropertyId == model.SubInspectId);
lblSubInspectName.Label = "管道号";
var piping = Funs.DB.PreRun_PropertySysPiping.Where(x => propertyIds.Contains(x.PropertyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"管道：{piping.PipingCode}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.PipingCode))}";
}
}
else
{
var piping = Funs.DB.PreRun_TechnologySysPiping.FirstOrDefault(x => x.TechnologyId == model.SubInspectId);
lblSubInspectName.Label = "设备位号";
var piping = Funs.DB.PreRun_TechnologySysPiping.Where(x => propertyIds.Contains(x.TechnologyId)).ToList();
if (piping != null)
{
lblSubInspectId.Text = $"设备：{piping.TagNumber}";
lblSubInspectName.Text = $"{string.Join(",", piping.ConvertAll(x => x.TagNumber))}";
}
}
//检查项
lblTermItemId.Text = model.TermItemName;
lblTermItemName.Text = model.TermItemName;
//问题描述
lblQuestionDesc.Text = model.QuestionDesc;
//整改意见
lblRectifyOpinion.Text = model.RectifyOpinion;
//整改时间
lblRectifyTime.Text = model.RectifyTime != null ? model.RectifyTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//要求整改完成时间
lblAdjustCompleteTime.Text = model.AdjustCompleteTime != null ? model.AdjustCompleteTime.Value.ToString("yyyy-MM-dd hh:mm:ss") : string.Empty;
//检查人
lblInspectUser.Text = model.InspectUserName;
//处理人
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandle.aspx.designer.cs
Generated
+6 -6
View File
@@ -96,22 +96,22 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.Label lblProblemType;
/// <summary>
/// lblSubInspectId 控件。
/// lblSubInspectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblSubInspectId;
protected global::FineUIPro.Label lblSubInspectName;
/// <summary>
/// lblTermItemId 控件。
/// lblTermItemName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblTermItemId;
protected global::FineUIPro.Label lblTermItemName;
/// <summary>
/// lblQuestionDesc 控件。
@@ -141,13 +141,13 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
protected global::FineUIPro.Label lblInspectUser;
/// <summary>
/// lblRectifyTime 控件。
/// lblAdjustCompleteTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblRectifyTime;
protected global::FineUIPro.Label lblAdjustCompleteTime;
/// <summary>
/// Panel1 控件。
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TailTermHandleList.aspx
+1 -1
View File
@@ -128,7 +128,7 @@
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="检查项巡检审核" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="检查项巡检确认" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="660px">
</f:Window>
SGGL/FineUIPro.Web/TestRun/BeforeTestRun/TestRunRecordUploadList.aspx.cs
+2 -2
View File
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
{
protected void Page_Load(object sender, EventArgs e)
{
if(!IsPostBack)
if (!IsPostBack)
{
InitTreeMenu();
}
@@ -295,7 +295,7 @@ namespace FineUIPro.Web.TestRun.BeforeTestRun
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();
var yscInspectItems = Funs.DB.PreRun_SubInspectTerm.Where(x => workPackIds.Contains(x.WorkPackId) && subSystemIds.Contains(x.SubSystemId) && x.InspectionIsAllPass == 1 && x.IsSiteImplement == 1).ToList();
if (yscInspectItems.Count > 0)
{
var selectPtids = string.Join(",", yscInspectItems.ConvertAll(x => x.PropertyTechnologyId)).Split(',').ToList();