lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20230921新增安全巡检新增分部分项选择、质量巡检新增分部分项选择

Browse Source
This commit is contained in:
杨红卫
2023-09-21 17:34:59 +08:00
parent 017edfa146
commit 9fb8e5e030
35 changed files with 1076 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2023-09-21.sql
+96
View File
@@ -0,0 +1,96 @@
ALTER TABLE HSSE_Hazard_HazardRegister ADD WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE HSSE_Hazard_HazardRegister ADD WorkPackageName NVARCHAR(2000) NULL
GO
ALTER TABLE Check_CheckControl ADD WorkPackageId NVARCHAR(2000) NULL
GO
ALTER TABLE Check_CheckControl ADD WorkPackageName NVARCHAR(2000) NULL
GO
ALTER VIEW [dbo].[View_Hazard_HazardRegister]
AS
/**********°²È«Ñ²¼ìÊÓͼ*************/
SELECT Registration.HazardRegisterId,
Registration.HazardCode,
Registration.RegisterDate,
Registration.RegisterDef,
Registration.Rectification,
Registration.Place,
Registration.ResponsibleUnit,
Registration.Observer,
Registration.RectifiedDate,
Registration.ProjectId,
Registration.states,
Registration.IsEffective,
Registration.ResponsibleMan,
Registration.CheckManId,
Registration.CheckTime,
Registration.RectificationPeriod,
(CASE WHEN Registration.ImageUrl IS NULL THEN at.AttachUrl ELSE Registration.ImageUrl END) AS ImageUrl,
(CASE WHEN Registration.RectificationImageUrl IS NULL THEN at_r.AttachUrl ELSE Registration.RectificationImageUrl END) AS RectificationImageUrl,
Registration.RectificationTime,
Registration.ConfirmMan,
Registration.ConfirmDate,
Registration.HandleIdea,
Registration.CutPayment,
Registration.ProblemTypes,
Registration.CheckSpecialId,
Registration.CheckItemDetailId,
Registration.SupCheckItemSetId,
Registration.CheckItemSetId,
Registration.SafeSupervisionId,
Registration.SafeSupervisionIsOK,
Project.ProjectName,
Registration.CheckCycle,
ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
Unit.UnitName AS ResponsibilityUnitName,
User1.PersonName AS ResponsibilityManName,
ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
User2.PersonName AS CheckManName,
ISNULL(User2.Telephone,'') AS CheckManTel,
User2.UnitId AS SendUnitId,
User3.PersonName AS ConfirmManName,
ISNULL(User3.Telephone,'') AS ConfirmManTel,
User4.PersonName AS ResponsibilityManName2,
ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä'
WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ'
WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä'
WHEN Registration.states='3' THEN 'Òѱջ·'
ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr,
RegisterTypes.RegisterTypesId,
RegisterTypes.RegisterTypesName,
Registration.DIC_ID,
Registration.CCManIds,
CCManNames = STUFF(( SELECT ',' + PersonName FROM Person_Persons
where PATINDEX('%,' + RTRIM(Person_Persons.PersonId) + ',%',',' + Registration.CCManIds + ',')>0
ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
FOR XML PATH('')), 1, 1,''),
Registration.Requirements,
Registration.HazardValue,
Registration.RegisterTypes2Id ,
RegisterTypes2.RegisterTypesName as RegisterTypes2Name,
Registration.RegisterTypes3Id ,
RegisterTypes3.RegisterTypesName as RegisterTypes3Name,
Registration.RegisterTypes4Id ,
RegisterTypes4.RegisterTypesName as RegisterTypes4Name,
Registration.WorkPackageId,
Registration.WorkPackageName
FROM dbo.HSSE_Hazard_HazardRegister AS Registration
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes2 ON RegisterTypes2.RegisterTypesId = Registration.RegisterTypes2Id
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes3 ON RegisterTypes3.RegisterTypesId = Registration.RegisterTypes3Id
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes4 ON RegisterTypes4.RegisterTypesId = Registration.RegisterTypes4Id
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
LEFT JOIN dbo.Person_Persons AS User1 ON User1.PersonId = Registration.ResponsibleMan
LEFT JOIN dbo.Person_Persons AS User2 ON User2.PersonId = Registration.CheckManId
LEFT JOIN dbo.Person_Persons AS User3 ON User3.PersonId = Registration.ConfirmMan
LEFT JOIN dbo.Person_Persons AS User4 ON User4.PersonId = Registration.ResponsibleMan2
LEFT JOIN dbo.AttachFile AS at ON at.ToKeyId = Registration.HazardRegisterId
LEFT JOIN dbo.AttachFile AS at_r ON at_r.ToKeyId = Registration.HazardRegisterId+'-R'
GO
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+2
View File
@@ -82,6 +82,8 @@ namespace BLL
RegisterTypes2Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes2Id) ? null : hazardRegister.RegisterTypes2Id,
RegisterTypes3Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes3Id) ? null : hazardRegister.RegisterTypes3Id,
RegisterTypes4Id = string.IsNullOrEmpty(hazardRegister.RegisterTypes4Id) ? null : hazardRegister.RegisterTypes4Id,
WorkPackageId=WorkPackageService.getWorkPageIdsByControlItemAndCycle(hazardRegister.WorkPackageId, null),
WorkPackageName= WorkPackageService.getWorkPageNamesByControlItemAndCycle(hazardRegister.WorkPackageId, null),
};
var isUpdate = db.HSSE_Hazard_HazardRegister.FirstOrDefault(x => x.HazardRegisterId == newHazardRegister.HazardRegisterId);
if (isUpdate == null)
SGGL/BLL/CQMS/Check/CheckControlService.cs
+17 -4
View File
@@ -62,6 +62,9 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.Check_CheckControl.InsertOnSubmit(newCheckControl);
db.SubmitChanges();
}
@@ -93,6 +96,9 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.Check_CheckControl.InsertOnSubmit(newCheckControl);
db.SubmitChanges();
}
@@ -215,6 +221,8 @@ namespace BLL
newCheckControl.State = CheckControl.State;
newCheckControl.SaveHandleMan = CheckControl.SaveHandleMan;
newCheckControl.WorkPackageId = CheckControl.WorkPackageId;
newCheckControl.WorkPackageName = CheckControl.WorkPackageName;
db.SubmitChanges();
}
public static List<Model.Check_CheckControl> GetListDataForApi(string state, string name, string projectId, int index, int page)
@@ -277,7 +285,8 @@ namespace BLL
x.RectifyOpinion,
x.LimitDate,
x.CNProfessionalCode,
x.WorkPackageId,
x.WorkPackageName,
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(),
UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First()
@@ -316,6 +325,8 @@ namespace BLL
x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName;
x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode);
x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r");
x.WorkPackageId = list[i].WorkPackageId;
x.WorkPackageName = list[i].WorkPackageName;
listRes.Add(x);
}
return listRes;
@@ -489,11 +500,11 @@ namespace BLL
x.RectifyOpinion,
x.LimitDate,
x.CNProfessionalCode,
x.WorkPackageId,
x.WorkPackageName,
CNProfessionalName = (from y in db.Base_CNProfessional where y.CNProfessionalId == x.CNProfessionalCode select y.ProfessionalName).First(),
UnitWork = (from y in db.WBS_UnitWork where y.UnitWorkId == x.UnitWorkId select y.UnitWorkCode + "-" + y.UnitWorkName + (y.ProjectType == "1" ? "(建筑)" : "(安装)")).First(),
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First()
CheckMan = (from y in db.Person_Persons where y.PersonId == x.CheckMan select y.PersonName).First(),
};
var list = qq1.Skip(index * page).Take(page).ToList();
@@ -522,6 +533,8 @@ namespace BLL
x.CNProfessionalCode = list[i].CNProfessionalCode + "$" + list[i].CNProfessionalName;
x.AttachUrl = AttachFileService.getFileUrl(x.CheckControlCode);
x.ReAttachUrl = AttachFileService.getFileUrl(x.CheckControlCode + "r");
x.WorkPackageId = list[i].WorkPackageId;
x.WorkPackageName = list[i].WorkPackageName;
listRes.Add(x);
}
return listRes;
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+78
View File
@@ -751,6 +751,84 @@ namespace BLL
}
#endregion
#region 根据工作包ID获取wbs节点及父节点名称字符串
/// <summary>
/// 根据工作包ID获取wbs节点及父节点字符串
/// </summary>
/// <param name="controlItemAndCycleId"></param>
/// <returns></returns>
public static string getWorkPageNamesByControlItemAndCycle(string workPackageId, string controlItemAndCycleId)
{
string returnValues = string.Empty;
string ControlItemName=string.Empty;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
var getControlItemAndCycle = Funs.DB.WBS_ControlItemAndCycle.FirstOrDefault(x => x.ControlItemAndCycleId == controlItemAndCycleId);
if (getControlItemAndCycle != null)
{
workPackageId = getControlItemAndCycle.WorkPackageId;
ControlItemName = getControlItemAndCycle.ControlItemContent;
}
}
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPackageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(ControlItemName))
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent + "|" + ControlItemName);
}
else
{
returnValues = getSelectIds(getWorkPackage.WorkPackageId, getWorkPackage.PackageContent);
}
}
return returnValues;
}
/// <summary>
/// id
/// </summary>
/// <param name="node"></param>
/// <param name="id"></param>
/// <returns></returns>
public static string getSelectNames(string workPageId, string returnValues)
{
var getWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == workPageId);
if (getWorkPackage != null)
{
if (!string.IsNullOrEmpty(getWorkPackage.SuperWorkPackageId))
{
var getSupWorkPackage = Funs.DB.WBS_WorkPackage.FirstOrDefault(x => x.WorkPackageId == getWorkPackage.SuperWorkPackageId);
if (getSupWorkPackage != null)
{
returnValues = getWorkPackage.PackageContent + "|" + returnValues;
returnValues = getSelectIds(getWorkPackage.SuperWorkPackageId, returnValues);
}
}
else
{
var getUnitWork = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == getWorkPackage.UnitWorkId);
if (getUnitWork != null)
{
if (getUnitWork.ProjectType == "1")
{
returnValues = "建筑工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
}
else
{
returnValues = "安装工程|" + getUnitWork.UnitWorkName + "|" + returnValues;
}
}
}
}
return returnValues;
}
#endregion
#region 更新分部分项概算费用
/// <summary>
/// 更新分部分项概算费用
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+8 -1
View File
@@ -71,7 +71,11 @@ namespace BLL
RegisterTypes2Id = hazardRegister.RegisterTypes2Id,
RegisterTypes3Id = hazardRegister.RegisterTypes3Id,
RegisterTypes4Id = hazardRegister.RegisterTypes4Id,
CCManIds = hazardRegister.CCManIds
CCManIds = hazardRegister.CCManIds,
WorkPackageId = hazardRegister.WorkPackageId,
WorkPackageName = hazardRegister.WorkPackageName,
};
db.HSSE_Hazard_HazardRegister.InsertOnSubmit(newHazardRegister);
db.SubmitChanges();
@@ -116,6 +120,9 @@ namespace BLL
newHazardRegister.RegisterTypes3Id = hazardRegister.RegisterTypes3Id;
newHazardRegister.RegisterTypes4Id = hazardRegister.RegisterTypes4Id;
newHazardRegister.CCManIds = hazardRegister.CCManIds;
newHazardRegister.WorkPackageId = newHazardRegister.WorkPackageId;
newHazardRegister.WorkPackageName = newHazardRegister.WorkPackageName;
//把附件表的路径复制过来
Model.AttachFile file = BLL.AttachFileService.GetAttachFile(hazardRegister.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId);
if (file != null)
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
+2 -4
View File
@@ -51,12 +51,9 @@ namespace FineUIPro.Web.CQMS.Check
Funs.FineUIPleaseSelect(this.dpHandelStatus);
btnNew.OnClientClick = Window1.GetShowReference("ChecklistEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
}
@@ -99,7 +96,8 @@ namespace FineUIPro.Web.CQMS.Check
}
protected DataTable ChecklistData()
{
string strSql = @"SELECT chec.CheckControlCode,chec.CheckSite,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
string strSql = @"SELECT chec.CheckControlCode,(case when chec.WorkPackageName is null then chec.CheckSite else chec.WorkPackageName end) as CheckSite
,chec.ProjectId,chec.unitId,cNProfessional.ProfessionalName,"
+ @" QualityQuestionType.QualityQuestionType as QuestionType,"
+ @" chec.checkman,chec.CheckDate,chec.DocCode,chec.submitman,chec.state,chec.CNProfessionalCode,"
+ @" unit.UnitName,unitWork.UnitWorkName+(case unitWork.ProjectType when '1' then '(建筑)' else '(安装)' end) as UnitWorkName,u.PersonName "
SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx
+7 -4
View File
@@ -39,9 +39,8 @@
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">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
@@ -69,12 +68,16 @@
<f:TextBox ID="drpQuestionType" runat="server" Readonly="true" Label="问题类别" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow >
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程" ShowRedStar="true"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckSite" Readonly="true" ShowRedStar="true" runat="server" Label="部位" Required="true" LabelAlign="Right"
<f:TextBox ID="txtCheckSite" Readonly="true" runat="server" Label="部位" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtCheckDate" Readonly="true" ShowRedStar="true" runat="server" Label="巡检时间" Required="true" LabelAlign="Right"
SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx.cs
+1
View File
@@ -102,6 +102,7 @@ namespace FineUIPro.Web.CQMS.Check
gvApprove.DataSource = dt;
gvApprove.DataBind();
Model.Check_CheckControl checkControl = CheckControlService.GetCheckControl(CheckControlCode);
this.txtWorkPackageId.Text = checkControl.WorkPackageName;
txtDocCode.Text = checkControl.DocCode;
if (!string.IsNullOrEmpty(checkControl.UnitId))
{
SGGL/FineUIPro.Web/CQMS/Check/CheckListView.aspx.designer.cs
Generated
+13 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
namespace FineUIPro.Web.CQMS.Check
{
public partial class CheckListView {
public partial class CheckListView
{
/// <summary>
/// form1 控件。
@@ -111,6 +113,15 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::FineUIPro.TextBox drpQuestionType;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// txtCheckSite 控件。
/// </summary>
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
+32 -23
View File
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>质量巡检</title>
<title>质量巡检</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.labcenter {
@@ -39,13 +39,11 @@
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">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right"
>
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtDocCode" runat="server" Required="true" ShowRedStar="true" Label="编号" LabelAlign="Right"
MaxLength="50">
@@ -54,7 +52,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpUnit" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged" AutoPostBack="true" ShowRedStar="true" runat="server" Required="true" Label="施工单位" LabelAlign="Right" EmptyText="--请选择--" AutoSelectFirstItem="false" EnableEdit="true">
<f:DropDownList ID="drpUnit" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged" AutoPostBack="true" ShowRedStar="true" runat="server" Required="true" Label="施工单位" LabelAlign="Right" EmptyText="--请选择--" AutoSelectFirstItem="false" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpUnitWork" ShowRedStar="true" runat="server" Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false" Label="单位工程" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
@@ -68,13 +66,21 @@
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="90% 10%">
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程" ShowRedStar="true"></f:Label>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckSite" ShowRedStar="true" runat="server" Label="部位" Required="true" LabelAlign="Right"
<f:TextBox ID="txtCheckSite" runat="server" Label="部位" LabelAlign="Right"
MaxLength="50">
</f:TextBox>
<f:DatePicker ID="txtCheckDate" ShowRedStar="true" runat="server" Label="巡检时间" Required="true" LabelAlign="Right"
EnableEdit="true">
EnableEdit="false">
</f:DatePicker>
</Items>
</f:FormRow>
@@ -82,8 +88,8 @@
<Items>
<f:DropDownList ID="drpProposeUnit" ShowRedStar="true" Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false" runat="server" Label="提出单位" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DatePicker ID="txtLimitDate" ShowRedStar="true" Required="true" runat="server" Label="整改时间" LabelAlign="Right"
EnableEdit="true">
<f:DatePicker ID="txtLimitDate" ShowRedStar="true" Required="true" runat="server" Label="整改时间" LabelAlign="Right"
EnableEdit="false">
</f:DatePicker>
</Items>
</f:FormRow>
@@ -91,7 +97,6 @@
<Items>
<f:TextArea ID="txtQuestionDef" ShowRedStar="true" Required="true" runat="server" Label="问题描述" MaxLength="3000">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
@@ -100,9 +105,9 @@
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow >
<f:FormRow>
<Items>
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
<Items>
<f:Label runat="server" Text="问题图片：" CssStyle="padding-left:25px" Width="110px" CssClass="marginr" ShowLabel="false"></f:Label>
<f:Button ID="imgBtnFile" Text="问题图片" ToolTip="上传及查看" Icon="TableCell" runat="server"
@@ -120,7 +125,6 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:ContentPanel ID="ContentPanel3" Title="分包填写内容" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
@@ -137,9 +141,9 @@
<f:FormRow>
<Items>
<f:DatePicker ID="txtRectifyDate" ShowRedStar="true" Required="true" runat="server" Label="整改时间" LabelAlign="Right"
EnableEdit="true">
EnableEdit="false">
</f:DatePicker>
<f:Label runat="server" Hidden="true"></f:Label>
<f:Label runat="server" Hidden="true"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
@@ -149,8 +153,8 @@
<f:Label ID="lblAttach" CssStyle="padding-left:23px" Width="100px" runat="server" CssClass="marginr" ShowLabel="false"
Text="整改图片：">
</f:Label>
<f:Button ID="btnAttach" Text="整改图片" ToolTip="上传及查看" Icon="TableCell" runat="server" OnClick="btnAttach_Click">
</f:Button>
<f:Button ID="btnAttach" Text="整改图片" ToolTip="上传及查看" Icon="TableCell" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
@@ -186,10 +190,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="true" runat="server" Label="办理步骤" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="true" runat="server" Label="办理步骤" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpHandleMan" runat="server" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleMan" runat="server" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
@@ -201,7 +205,7 @@
<f:FormRow ID="plApprove1">
<Items>
<f:TextArea ID="txtOpinions" runat="server" Label="我的意见" MaxLength="3000">
</f:TextArea>
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ID="plApprove2">
@@ -236,7 +240,7 @@
<f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" >
<f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存">
</f:Button>
<f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1">
</f:Button>
@@ -257,6 +261,10 @@
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" OnClose="WindowAtt_Close" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
<f:Window ID="Window2" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window2_Close"
Width="800px" Height="650px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" EnablePostBack="true"
@@ -266,6 +274,7 @@
Icon="Delete" ConfirmText="确定删除当前数据？" ConfirmTarget="Parent" runat="server" Text="删除">
</f:MenuButton>
</f:Menu>
</form>
<script>
var menuID = '<%= Menu1.ClientID %>';
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.cs
+34
View File
@@ -1,6 +1,7 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
namespace FineUIPro.Web.CQMS.Check
{
@@ -140,6 +141,10 @@ namespace FineUIPro.Web.CQMS.Check
gvApprove.DataSource = dt;
gvApprove.DataBind();
Model.Check_CheckControl checkControl = CheckControlService.GetCheckControl(CheckControlCode);
this.hdWorkPackageId.Text = checkControl.WorkPackageId;
this.txtWorkPackageId.Text = checkControl.WorkPackageName;
txtDocCode.Text = checkControl.DocCode;
if (!string.IsNullOrEmpty(checkControl.UnitId))
{
@@ -372,6 +377,9 @@ namespace FineUIPro.Web.CQMS.Check
Model.Check_CheckControl checkControl = new Model.Check_CheckControl();
checkControl.DocCode = this.txtDocCode.Text.Trim();
checkControl.ProjectId = this.CurrUser.LoginProjectId;
checkControl.WorkPackageId = this.hdWorkPackageId.Text;
checkControl.WorkPackageName = this.txtWorkPackageId.Text;
if (this.drpUnit.SelectedValue != Const._Null)
{
checkControl.UnitId = this.drpUnit.SelectedValue;
@@ -712,5 +720,31 @@ namespace FineUIPro.Web.CQMS.Check
HandleMan();
}
}
/// <summary>
/// 分部分项选择
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btSearch_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window2.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window2.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
}
/// <summary>
/// 分部分项返回值
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window2_Close(object sender, WindowCloseEventArgs e)
{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text, '&');
if (getReturnValues.Count() > 1)
{
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageId.Text = getReturnValues[1].ToString();
}
}
}
}
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.designer.cs
Generated
+40 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Check {
namespace FineUIPro.Web.CQMS.Check
{
public partial class ChecklistEdit {
public partial class ChecklistEdit
{
/// <summary>
/// form1 控件。
@@ -111,6 +113,33 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::FineUIPro.DropDownList drpQuestionType;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// txtCheckSite 控件。
/// </summary>
@@ -417,6 +446,15 @@ namespace FineUIPro.Web.CQMS.Check {
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Window2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Menu1 控件。
/// </summary>
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx
+1 -1
View File
@@ -88,7 +88,7 @@
</f:Label>
<f:Label ID="lbSpotCheckDataRate" runat="server" Label="施工资料同步率">
</f:Label>
<f:Label ID="Label2" runat="server" Label="质量问题数">
<f:Label ID="lbCheckControlCount" runat="server" Label="质量问题数">
</f:Label>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.cs
+42 -14
View File
@@ -103,21 +103,38 @@ namespace FineUIPro.Web.DigData
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
this.lbAccident.Text = (from x in Funs.DB.Accident_AccidentPersonRecord
var getLargerHazardListItem =from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& y.States == Const.State_1
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getLargerHazardListItem = getLargerHazardListItem.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbExpertArgument.Text = getLargerHazardListItem.Count().ToString();
var getAccidentPersonRecord = from x in Funs.DB.Accident_AccidentPersonRecord
where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& x.States == Const.State_2
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getAccidentPersonRecord = getAccidentPersonRecord.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbAccident.Text = getAccidentPersonRecord.Count().ToString();
var getHazardRegister = from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == this.ProjectId && x.States != "4" && x.States != "0"
&& x.WorkPackageId.Contains(workPackageId)
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getHazardRegister = getHazardRegister.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbHSEProblemCount.Text= getHazardRegister.Count().ToString();
this.lbHSEProblemCount.Text= (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == this.ProjectId && x.States != null && x.States !="4" && x.States != "0"
select x).Count().ToString();
}
if (item == "CQMS")
{
@@ -126,9 +143,12 @@ namespace FineUIPro.Web.DigData
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where y.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
&& y.State == "8"
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getSpotCheckDetail = getSpotCheckDetail.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count(); //一次合格
@@ -142,6 +162,15 @@ namespace FineUIPro.Web.DigData
int okDateCount = getSpotCheckDetail.Where(x => x.IsDataOK == "1").Count(); //资料合格
this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
where x.ProjectId == this.ProjectId && x.WorkPackageId.Contains(workPackageId)
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getCheck_CheckControl = getCheck_CheckControl.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbCheckControlCount.Text = getCheck_CheckControl.Count().ToString();
///实体质量问题整改率
//int allNoOk = all - onesOKCount; ///问题数
//int oKCount = getSpotCheckDetail.Where(x => x.IsOK == true).Count(); //合格数
@@ -215,7 +244,6 @@ namespace FineUIPro.Web.DigData
/////项目进度完成百分比
//decimal s = Convert.ToDecimal(totalSJCost);
//this.lbJDRate.Text = totalPlanCost > 0 ? Math.Round(s / totalPlanCost).ToString() + "%" : "0%";
}
if (item == "HTGL")
{
SGGL/FineUIPro.Web/DigData/ProjectWBSDW.aspx.designer.cs
Generated
+2 -2
View File
@@ -204,13 +204,13 @@ namespace FineUIPro.Web.DigData
protected global::FineUIPro.Label lbSpotCheckDataRate;
/// <summary>
/// Label2 控件。
/// lbCheckControlCount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
protected global::FineUIPro.Label lbCheckControlCount;
/// <summary>
/// lbSpotCheckOkRate 控件。
SGGL/FineUIPro.Web/DigData/WBSDW.aspx
+1 -1
View File
@@ -62,7 +62,7 @@
</f:Label>
<f:Label ID="lbAccident" runat="server" Label="安全事故数量">
</f:Label>
<f:Label ID="Label3" runat="server" Label="安全巡检问题总数">
<f:Label ID="lbHazardRegisterCount" runat="server" Label="安全巡检问题总数">
</f:Label>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.cs
+37 -11
View File
@@ -84,17 +84,35 @@ namespace FineUIPro.Web.DigData
if (item == "HSSE")
{
this.gpHSSE.Hidden = false;
this.lbExpertArgument.Text = (from x in Funs.DB.Solution_LargerHazardListItem
var getLargerHazardListItem = from x in Funs.DB.Solution_LargerHazardListItem
join y in Funs.DB.Solution_LargerHazardList on x.LargerHazardListId equals y.LargerHazardListId
where x.WorkPackageId.Contains(workPackageId) && y.States == Const.State_1
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getLargerHazardListItem = getLargerHazardListItem.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbExpertArgument.Text = getLargerHazardListItem.Count().ToString();
this.lbAccident.Text = (from x in Funs.DB.Accident_AccidentPersonRecord
where x.WorkPackageId.Contains(workPackageId)
&& x.States == Const.State_2
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x).Count().ToString();
var getAccidentPersonRecord = from x in Funs.DB.Accident_AccidentPersonRecord
where x.WorkPackageId.Contains(workPackageId)
&& x.States == Const.State_2
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getAccidentPersonRecord = getAccidentPersonRecord.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbAccident.Text = getAccidentPersonRecord.Count().ToString();
var getHazardRegister = from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.WorkPackageId.Contains(workPackageId) && x.States != null && x.States != "4" && x.States != "0"
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getHazardRegister = getHazardRegister.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbHazardRegisterCount.Text= getHazardRegister.Count().ToString();
}
if (item == "CQMS")
{
@@ -103,8 +121,11 @@ namespace FineUIPro.Web.DigData
var getSpotCheckDetail = from x in Funs.DB.Check_SpotCheckDetail
join y in Funs.DB.Check_SpotCheck on x.SpotCheckCode equals y.SpotCheckCode
where x.WorkPackageId.Contains(workPackageId) && y.State == "8"
&& (controlItemAndCycleId == null || x.WorkPackageId.Contains(controlItemAndCycleId))
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getSpotCheckDetail = getSpotCheckDetail.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
int all = getSpotCheckDetail.Count();
// this.lbSpotCheck1.Text = all.ToString();
int onesOKCount = getSpotCheckDetail.Where(x => x.IsOnesOK == true).Count();
@@ -118,8 +139,13 @@ namespace FineUIPro.Web.DigData
this.lbSpotCheckDataRate.Text = okYSCount > 0 ? Math.Round(okDateCount * 100.0 / (okYSCount * 1.0)).ToString() + "%" : "0%";
//// 质量检查问题整改率
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl select x;
var getCheck_CheckControl = from x in Funs.DB.Check_CheckControl
where x.WorkPackageId.Contains(workPackageId)
select x;
if (!string.IsNullOrEmpty(controlItemAndCycleId))
{
getCheck_CheckControl = getCheck_CheckControl.Where(x => x.WorkPackageId.Contains(controlItemAndCycleId));
}
this.lbCheckControlCount.Text = getCheck_CheckControl.Count().ToString();
}
SGGL/FineUIPro.Web/DigData/WBSDW.aspx.designer.cs
Generated
+2 -2
View File
@@ -159,13 +159,13 @@ namespace FineUIPro.Web.DigData
protected global::FineUIPro.Label lbAccident;
/// <summary>
/// Label3 控件。
/// lbHazardRegisterCount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
protected global::FineUIPro.Label lbHazardRegisterCount;
/// <summary>
/// gpCQMS 控件。
SGGL/FineUIPro.Web/ErrLog.txt
-18
View File
@@ -1,18 +0,0 @@
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.Person.PersonEdit.Page_Load(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Person\PersonEdit.aspx.cs:行号 229
在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
在 System.EventHandler.Invoke(Object sender, EventArgs e)
在 System.Web.UI.Control.OnLoad(EventArgs e)
在 System.Web.UI.Control.LoadRecursive()
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/20/2023 10:14:47
出错文件:http://localhost:8513/Person/PersonEdit.aspx?PersonId=d0aa5149-1d64-4266-8861-379c9a903c72
IP地址:::1
操作人员:JT
出错时间:09/20/2023 10:14:47
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -14233,7 +14233,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8513/</IISUrl>
<IISUrl>http://localhost:12669/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx
+118 -106
View File
@@ -9,112 +9,124 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" FocusOnPageLoad="true"
ShowRedStar="true" Required="true" LabelWidth="110px" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" LabelWidth="110px">
</f:TextBox>
<f:DatePicker ID="txtCheckTime" runat="server" Label="检查时间" ShowTime="true"
LabelAlign="Right" Required="True" ShowRedStar="true" LabelWidth="110px"
DateFormatString="yyyy-MM-dd HH:mm">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="危害因素" ID="drpRegisterTypes2" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList runat="server" Label="问题类型" ID="drpRegisterTypes" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="作业内容" ID="drpRegisterTypes3" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:DropDownList runat="server" Label="风险值" ID="drpHazardValue" EnableEdit="true" LabelWidth="110px">
<f:ListItem Value="0.3" Text="0.3"/>
<f:ListItem Value="1" Text="1"/>
<f:ListItem Value="3" Text="3"/>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" EnableEdit="true" LabelWidth="110px">
</f:DropDownList>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" LabelWidth="110px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableEdit="true" Label="责任单位" ID="drpUnit" LabelWidth="110px"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList runat="server" EnableEdit="true" Label="责任人" ID="drpResponsibleMan" LabelWidth="110px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableEdit="true" Label="单位工程" ID="drpWorkArea" LabelWidth="110px">
</f:DropDownList>
<f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelWidth="110px"
LabelAlign="Right" Required="True" ShowRedStar="true" ShowTime="true"
DateFormatString="yyyy-MM-dd HH:mm">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true" LabelWidth="110px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片" LabelWidth="110px"
Text="上传和查看" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableMultiSelect="True" EnableCheckBoxSelect="true" EnableEdit="true"
Label="抄送" ID="drpCCManIds" LabelWidth="110px" AutoPostBack="true"
OnSelectedIndexChanged="drpCCManIds_SelectedIndexChanged">
</f:DropDownList>
</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:HiddenField ID="hdCheckManId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="文件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="680px"
Height="480px">
</f:Window>
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" FocusOnPageLoad="true"
ShowRedStar="true" Required="true" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true">
</f:TextBox>
<f:DatePicker ID="txtCheckTime" runat="server" Label="检查时间" ShowTime="true"
LabelAlign="Right" Required="True" ShowRedStar="true"
DateFormatString="yyyy-MM-dd HH:mm">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="危害因素" ID="drpRegisterTypes2" EnableEdit="true">
</f:DropDownList>
<f:DropDownList runat="server" Label="问题类型" ID="drpRegisterTypes" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="作业内容" ID="drpRegisterTypes3" EnableEdit="true">
</f:DropDownList>
<f:DropDownList runat="server" Label="风险值" ID="drpHazardValue" EnableEdit="true">
<f:ListItem Value="0.3" Text="0.3" />
<f:ListItem Value="1" Text="1" />
<f:ListItem Value="3" Text="3" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" EnableEdit="true">
</f:DropDownList>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableEdit="true" Label="责任单位" ID="drpUnit"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList runat="server" EnableEdit="true" Label="责任人" ID="drpResponsibleMan">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableEdit="true" Label="单位工程" ID="drpWorkArea">
</f:DropDownList>
<f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限"
LabelAlign="Right" Required="True" ShowRedStar="true" ShowTime="true"
DateFormatString="yyyy-MM-dd HH:mm">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片"
Text="上传和查看" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="90% 10%">
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程" ShowRedStar="true"></f:Label>
<f:TextBox runat="server" ID="hdWorkPackageId" Hidden="true"></f:TextBox>
<f:Button ID="btSearch" ToolTip="选择" Icon="SystemSearch" runat="server" OnClick="btSearch_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableMultiSelect="True" EnableCheckBoxSelect="true" EnableEdit="true"
Label="抄送" ID="drpCCManIds" AutoPostBack="true"
OnSelectedIndexChanged="drpCCManIds_SelectedIndexChanged">
</f:DropDownList>
</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:HiddenField ID="hdCheckManId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAT" Title="文件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="680px"
Height="480px">
</f:Window>
<f:Window ID="Window1" Title="WBS" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="650px">
</f:Window>
</form>
</body>
</html>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
+32 -1
View File
@@ -139,6 +139,9 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.txtHandleIdea.Hidden = false;
this.txtHandleIdea.Text = registration.HandleIdea;
}
this.hdWorkPackageId.Text = registration.WorkPackageId;
this.txtWorkPackageId.Text = registration.WorkPackageName;
}
}
}
@@ -218,6 +221,8 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
States = "1", //待整改
RegisterDef = this.txtRegisterDef.Text.Trim(),
Requirements = this.txtRequirements.Text.Trim(),
WorkPackageId = this.hdWorkPackageId.Text,
WorkPackageName = this.txtWorkPackageId.Text,
};
if (this.drpRegisterTypes.SelectedValue != BLL.Const._Null)
{
@@ -297,7 +302,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Model.HSSE_Hazard_HazardRegister register = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(this.HazardRegisterId);
DateTime date = Convert.ToDateTime(register.CheckTime);
string dateStr = date.Year.ToString() + date.Month.ToString();
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HazardRegister/" + dateStr + "&menuId={1}&edit={2}", this.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId, edit)));
PageContext.RegisterStartupScript(WindowAT.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HazardRegister/" + dateStr + "&menuId={1}&edit={2}", this.HazardRegisterId, Const.HSSE_HiddenRectificationListMenuId, edit)));
}
}
@@ -312,5 +317,31 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
this.drpCCManIds.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCCManIds.SelectedValueArray);
}
/// <summary>
/// 分部分项选择
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btSearch_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdWorkPackageId.ClientID)
+ Window1.GetShowReference(String.Format("~/DigData/ShowProjectWBS.aspx?levle={0}", 3, "选择WBS - ")));
}
/// <summary>
/// 分部分项返回值
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
var getReturnValues = Funs.GetStrListByStr(this.hdWorkPackageId.Text, '&');
if (getReturnValues.Count() > 1)
{
this.hdWorkPackageId.Text = getReturnValues[0].ToString();
this.txtWorkPackageId.Text = getReturnValues[1].ToString();
}
}
}
}
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs
Generated
+40 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection {
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationAdd {
public partial class HiddenRectificationAdd
{
/// <summary>
/// form1 控件。
@@ -174,6 +176,33 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks>
protected global::FineUIPro.LinkButton UploadAttach;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// hdWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox hdWorkPackageId;
/// <summary>
/// btSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btSearch;
/// <summary>
/// drpCCManIds 控件。
/// </summary>
@@ -228,6 +257,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAT 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAT;
/// <summary>
/// Window1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx
+25 -20
View File
@@ -11,59 +11,59 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" Readonly="true"
ShowRedStar="true" Required="true" LabelWidth="110px" Height="64px">
ShowRedStar="true" Required="true" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" LabelWidth="110px">
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" >
</f:TextBox>
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" LabelWidth="110px"></f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" >
</f:TextBox>
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" >
</f:TextBox>
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
@@ -71,24 +71,29 @@
<Items>
<f:TextBox runat="server" ID="txtOldHandleIdea" Label="之前复检问题"
Hidden="true" Readonly="true" FocusOnPageLoad="true"
LabelWidth="110px"></f:TextBox>
></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" LabelWidth="110px" Readonly="true">
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRectification" runat="server" Label="采取措施" Readonly="true" LabelWidth="110px">
<f:TextBox ID="txtRectification" runat="server" Label="采取措施" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片" LabelWidth="110px"
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片"
Text="查看/上传" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
<f:LinkButton ID="UploadAttachR" runat="server" Label="整改后照片" Text="查看"
@@ -99,7 +104,7 @@
<f:FormRow>
<Items>
<f:RadioButtonList ID="ckConfirm" runat="server" Label="是否通过" AutoColumnWidth="true" ShowRedStar="true"
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" LabelWidth="110px">
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged" >
<f:RadioItem Value="True" Selected="True" Text="通过" />
<f:RadioItem Value="False" Text="不通过" />
</f:RadioButtonList>
@@ -108,7 +113,7 @@
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述"
Hidden="true" LabelWidth="110px"></f:TextBox>
Hidden="true" ></f:TextBox>
</Items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.txtRectificationPeriod.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", registration.RectificationPeriod);
this.drpCCManIds.Text = registration.CCManNames;
this.txtRectification.Text = registration.Rectification;
this.txtWorkPackageId.Text = registration.WorkPackageName;
if (registration.States == "3") //已闭环
{
this.ckConfirm.SelectedValue = "True";
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationConfirm.aspx.designer.cs
Generated
+13 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection {
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationConfirm {
public partial class HiddenRectificationConfirm
{
/// <summary>
/// form1 控件。
@@ -165,6 +167,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks>
protected global::FineUIPro.TextBox txtOldHandleIdea;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// drpCCManIds 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx
+22 -17
View File
@@ -11,71 +11,76 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" Readonly="true"
ShowRedStar="true" Required="true" LabelWidth="110px" Height="64px">
ShowRedStar="true" Required="true" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" LabelWidth="110px">
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" >
</f:TextBox>
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" LabelWidth="110px"></f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" >
</f:TextBox>
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" >
</f:TextBox>
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true" Readonly="true"
LabelWidth="110px"></f:TextBox>
></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" LabelWidth="110px" Readonly="true">
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
@@ -88,7 +93,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片" LabelWidth="110px"
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片"
Text="查看" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
<f:LinkButton ID="UploadAttachR" runat="server" Label="整改后照片" Text="上传"
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.cs
+1
View File
@@ -87,6 +87,7 @@ namespace FineUIPro.Web.HiddenInspection
this.drpCCManIds.Text = registration.CCManNames;
this.txtRectification.Text = registration.Rectification;
this.txtHandleIdea.Text = registration.HandleIdea;
this.txtWorkPackageId.Text = registration.WorkPackageName;
if (!string.IsNullOrEmpty(registration.HandleIdea))
{
this.txtHandleIdea.Hidden = false;
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationRectify.aspx.designer.cs
Generated
+13 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HiddenInspection {
namespace FineUIPro.Web.HiddenInspection
{
public partial class HiddenRectificationRectify {
public partial class HiddenRectificationRectify
{
/// <summary>
/// form1 控件。
@@ -156,6 +158,15 @@ namespace FineUIPro.Web.HiddenInspection {
/// </remarks>
protected global::FineUIPro.TextBox txtRectificationPeriod;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// txtHandleIdea 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx
+22 -17
View File
@@ -11,74 +11,79 @@
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" LabelWidth="110px">
<Rows>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" Readonly="true"
ShowRedStar="true" Required="true" LabelWidth="110px" Height="64px">
ShowRedStar="true" Required="true" Height="64px">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" LabelWidth="110px">
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true" >
</f:TextBox>
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="危害因素" ID="drpRegisterTypes2" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="问题类型" ID="drpRegisterTypes" Readonly="true" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="作业内容" ID="drpRegisterTypes3" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="风险值" ID="drpHazardValue" Readonly="true" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" LabelWidth="110px">
<f:TextBox runat="server" Label="导致伤害/事故" ID="drpRegisterTypes4" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" LabelWidth="110px"></f:TextBox>
<f:TextBox runat="server" ID="txtRequirements" Label="整改要求" Readonly="true" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任单位" ID="drpUnit" ShowRedStar="true">
</f:TextBox>
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="责任人" ID="drpResponsibleMan" ShowRedStar="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" LabelWidth="110px">
<f:TextBox runat="server" Readonly="true" Label="单位工程" ID="drpWorkArea" ShowRedStar="true">
</f:TextBox>
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelWidth="110px" Readonly="true">
<f:TextBox ID="txtRectificationPeriod" runat="server" Label="整改期限" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" LabelWidth="110px" Readonly="true">
<f:Label runat="server" ID="txtWorkPackageId" Label="分部分项工程"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" Label="抄送" ID="drpCCManIds" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtRectification" runat="server" Label="采取措施" Readonly="true" LabelWidth="110px">
<f:TextBox ID="txtRectification" runat="server" Label="采取措施" Readonly="true" >
</f:TextBox>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述"
Readonly="true" LabelWidth="110px"></f:TextBox>
Readonly="true" ></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.cs
+1
View File
@@ -92,6 +92,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.RectificationImageUrl = registration.RectificationImageUrl;
this.divImageUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.ImageUrl);
this.divRectificationImageUrl.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", this.RectificationImageUrl);
this.txtWorkPackageId.Text = registration.WorkPackageName;
}
}
}
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationView.aspx.designer.cs
Generated
+13 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection {
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationView {
public partial class HiddenRectificationView
{
/// <summary>
/// form1 控件。
@@ -156,6 +158,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// </remarks>
protected global::FineUIPro.TextBox txtRectificationPeriod;
/// <summary>
/// txtWorkPackageId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkPackageId;
/// <summary>
/// drpCCManIds 控件。
/// </summary>
SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs
+18
View File
@@ -373,5 +373,23 @@ namespace Model
get;
set;
}
/// <summary>
/// 分部分项id
/// </summary>
public string WorkPackageId
{
get;
set;
}
/// <summary>
/// 分部分项名称
/// </summary>
public string WorkPackageName
{
get;
set;
}
}
}
SGGL/Model/Model.cs
+132
View File
@@ -39388,6 +39388,10 @@ namespace Model
private string _SaveHandleMan;
private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Person_Persons> _Person_Persons;
@@ -39444,6 +39448,10 @@ namespace Model
partial void OnProposeUnitIdChanged();
partial void OnSaveHandleManChanging(string value);
partial void OnSaveHandleManChanged();
partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion
public Check_CheckControl()
@@ -39922,6 +39930,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
get
{
return this._WorkPackageName;
}
set
{
if ((this._WorkPackageName != value))
{
this.OnWorkPackageNameChanging(value);
this.SendPropertyChanging();
this._WorkPackageName = value;
this.SendPropertyChanged("WorkPackageName");
this.OnWorkPackageNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -100589,6 +100637,10 @@ namespace Model
private string _HazardValue;
private string _WorkPackageName;
private string _WorkPackageId;
private EntityRef<Base_Unit> _Base_Unit;
private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -100689,6 +100741,10 @@ namespace Model
partial void OnRegisterTypes4IdChanged();
partial void OnHazardValueChanging(string value);
partial void OnHazardValueChanged();
partial void OnWorkPackageNameChanging(string value);
partial void OnWorkPackageNameChanged();
partial void OnWorkPackageIdChanging(string value);
partial void OnWorkPackageIdChanged();
#endregion
public HSSE_Hazard_HazardRegister()
@@ -101626,6 +101682,46 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
get
{
return this._WorkPackageName;
}
set
{
if ((this._WorkPackageName != value))
{
this.OnWorkPackageNameChanging(value);
this.SendPropertyChanging();
this._WorkPackageName = value;
this.SendPropertyChanged("WorkPackageName");
this.OnWorkPackageNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this.OnWorkPackageIdChanging(value);
this.SendPropertyChanging();
this._WorkPackageId = value;
this.SendPropertyChanged("WorkPackageId");
this.OnWorkPackageIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@@ -266763,6 +266859,10 @@ namespace Model
private string _RegisterTypes4Name;
private string _WorkPackageId;
private string _WorkPackageName;
public View_Hazard_HazardRegister()
{
}
@@ -267678,6 +267778,38 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
public string WorkPackageId
{
get
{
return this._WorkPackageId;
}
set
{
if ((this._WorkPackageId != value))
{
this._WorkPackageId = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
public string WorkPackageName
{
get
{
return this._WorkPackageName;
}
set
{
if ((this._WorkPackageName != value))
{
this._WorkPackageName = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_HJGL_Batch_PointBatch")]
SGGL/WebAPI/Controllers/CQMS/CheckListController.cs
+3
View File
@@ -81,12 +81,15 @@ namespace Mvc.Controllers
{
if (string.IsNullOrEmpty(CheckControl.CheckControlCode))
{
CheckControl.WorkPackageId = WorkPackageService.getWorkPageIdsByControlItemAndCycle(CheckControl.WorkPackageId, null);
CheckControl.WorkPackageName = WorkPackageService.getWorkPageNamesByControlItemAndCycle(CheckControl.WorkPackageId, null);
if (string.IsNullOrEmpty(CheckControl.DocCode))
{
string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-06-CM03-XJ-";
CheckControl.DocCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.Check_CheckControl", "DocCode", prefix);
}
CheckControl.CheckControlCode = Guid.NewGuid().ToString();
BLL.CheckControlService.AddCheckControlForApi(CheckControl);
//BLL.AttachFileService.updateAttachFile(CheckControl.ReAttachUrl, CheckControl.CheckControlCode+"r", Const.CheckListMenuId);
//BLL.AttachFileService.updateAttachFile(CheckControl.AttachUrl, CheckControl.CheckControlCode, Const.CheckListMenuId);