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-09-13 20:42:47 +08:00
parent b17e1900e2
commit 7cca1b3cd3
8 changed files with 128 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs
+24
View File
@@ -667,6 +667,30 @@ namespace FineUIPro.Web.HSSE.License
}
}
var item13 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 13);
if (item13 != null)
{
if (item13.IsUsed == true)
{
Bookmark bookmarkUser13 = doc.Range.Bookmarks["User13"];//确认执行
if (bookmarkUser13 != null)
{
bookmarkUser13.Text = "√";
}
}
else
{
Bookmark bookmarkIsFit13 = doc.Range.Bookmarks["IsFit13"];
if (bookmarkIsFit13 != null)
{
if (item13 != null)
{
bookmarkIsFit13.Text = "×";
}
}
}
}
}
//审核记录
SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs
+2 -2
View File
@@ -345,7 +345,7 @@ namespace FineUIPro.Web.HSSE.License
Bookmark bookmarkWorkType = doc.Range.Bookmarks["WorkType"];//作业类别
if (bookmarkWorkType != null)
{
if (getHeightWork != null)
if (getHeightWork.WorkType != null)
{
bookmarkWorkType.Text = getHeightWork.WorkType;
@@ -380,7 +380,7 @@ namespace FineUIPro.Web.HSSE.License
Bookmark bookmarkEquipmentTools = doc.Range.Bookmarks["EquipmentTools"];//设备及工具
if (bookmarkEquipmentTools != null)
{
if (getHeightWork != null)
if (getHeightWork.EquipmentTools != null)
{
bookmarkEquipmentTools.Text = getHeightWork.EquipmentTools;
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx
+21 -17
View File
@@ -21,72 +21,76 @@
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lbLicenseCode" runat="server" Label="编号" LabelWidth="120px">
<f:Label ID="lbLicenseCode" runat="server" Label="编号" LabelWidth="180px">
</f:Label>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtApplyUnit" runat="server" Label="申请单位" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtApplyUnit" runat="server" Label="申请单位" Readonly="true" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtWorkAreaName" runat="server" Label="单位工程" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtWorkAreaName" runat="server" Label="单位工程" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkPalce" runat="server" Label="作业地点" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtWorkPalce" runat="server" Label="作业地点" Readonly="true" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtFireWatchManName" runat="server" Label="监护人" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtFireWatchManName" runat="server" Label="监护人" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkMeasures" runat="server" Label="作业内容" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtWorkMeasures" runat="server" Label="作业内容" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtWorkDate" runat="server" Label="作业时间" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtWorkDate" runat="server" Label="作业时间" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtLimitedDescribe" runat="server" Label="空间内介质描述" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtLimitedDescribe" runat="server" Label="空间内介质描述" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtIsBoolOther" runat="server" Label="是否存在其他介质" Readonly="true" LabelWidth="120px">
</f:TextBox>
<f:TextBox ID="txtIsBoolHarmfulGas" runat="server" Label="作业是否耗氧或产生其它有毒有害气体" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtIsBoolOther" runat="server" Label="是否存在其他介质" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTestResult" runat="server" Label="氧含量测试结果" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtTestResult" runat="server" Label="氧含量测试结果" Readonly="true" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTestDate" runat="server" Label="测试时间" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtTestDate" runat="server" Label="测试时间" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTestPerson" runat="server" Label="测试人" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtTestPerson" runat="server" Label="测试人" Readonly="true" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtVenStep" runat="server" Label="通风措施" Readonly="true" LabelWidth="120px">
<f:TextBox ID="txtVenStep" runat="server" Label="通风措施" Readonly="true" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtIsBoolHarmfulGas" runat="server" Label="作业是否耗氧或产生其它有毒有害气体" Readonly="true" LabelWidth="300px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="受限空间作业安全措施" EnableCollapse="true"
SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.designer.cs
Generated
+9 -9
View File
@@ -122,15 +122,6 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.TextBox txtIsBoolOther;
/// <summary>
/// txtIsBoolHarmfulGas 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIsBoolHarmfulGas;
/// <summary>
/// txtTestResult 控件。
/// </summary>
@@ -167,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License
/// </remarks>
protected global::FineUIPro.TextBox txtVenStep;
/// <summary>
/// txtIsBoolHarmfulGas 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtIsBoolHarmfulGas;
/// <summary>
/// Grid1 控件。
/// </summary>