修改作业票
This commit is contained in:
parent
b17e1900e2
commit
7cca1b3cd3
|
|
@ -0,0 +1,6 @@
|
|||
--增加射线表负责人姓名和监护人姓名字段
|
||||
ALTER TABLE License_RadialWork
|
||||
ADD WorkLeaderName nvarchar(50) null;
|
||||
|
||||
ALTER TABLE License_RadialWork
|
||||
ADD FireWatchManName nvarchar(50) null;
|
||||
|
|
@ -181,14 +181,18 @@ namespace BLL
|
|||
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
|
||||
RadialType = x.RadialType,
|
||||
WorkLeaderId = x.WorkLeaderId,
|
||||
WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
|
||||
//负责人
|
||||
// WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
WorkPalce = x.WorkPalce,
|
||||
WorkMeasures = x.WorkMeasures,
|
||||
FireWatchManId = x.FireWatchManId,
|
||||
FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
|
||||
//监护人
|
||||
// FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
WatchManContact = x.WatchManContact,
|
||||
CancelManId = x.CancelManId,
|
||||
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
|
||||
|
|
@ -290,6 +294,7 @@ namespace BLL
|
|||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
|
|
@ -645,14 +650,16 @@ namespace BLL
|
|||
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
|
||||
RadialType = x.RadialType,
|
||||
WorkLeaderId = x.WorkLeaderId,
|
||||
WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
|
||||
//WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
WorkPalce = x.WorkPalce,
|
||||
WorkMeasures = x.WorkMeasures,
|
||||
FireWatchManId = x.FireWatchManId,
|
||||
FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
|
||||
//FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
WatchManContact = x.WatchManContact,
|
||||
CancelManId = x.CancelManId,
|
||||
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
|
||||
|
|
@ -1578,7 +1585,8 @@ namespace BLL
|
|||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
LimitedDescribe=newItem.LimitedDescribe,
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
LimitedDescribe =newItem.LimitedDescribe,
|
||||
IsBoolOther=newItem.IsBoolOther,
|
||||
IsBoolHarmfulGas=newItem.IsBoolHarmfulGas,
|
||||
TestResult=newItem.TestResult,
|
||||
|
|
@ -1636,6 +1644,7 @@ namespace BLL
|
|||
updateLimitedSpace.NextManId = newLimitedSpace.NextManId;
|
||||
updateLimitedSpace.States = newLimitedSpace.States;
|
||||
|
||||
updateLimitedSpace.WorkAreaId = newLimitedSpace.WorkAreaId;
|
||||
updateLimitedSpace.LimitedDescribe = newLimitedSpace.LimitedDescribe;
|
||||
updateLimitedSpace.IsBoolOther = newLimitedSpace.IsBoolOther;
|
||||
updateLimitedSpace.IsBoolHarmfulGas = newLimitedSpace.IsBoolHarmfulGas;
|
||||
|
|
@ -1662,12 +1671,14 @@ namespace BLL
|
|||
ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate),
|
||||
RadialType = newItem.RadialType,
|
||||
WorkLeaderId = newItem.WorkLeaderId,
|
||||
WorkLeaderName = newItem.WorkLeaderName,
|
||||
WorkLeaderTel = newItem.WorkLeaderTel,
|
||||
ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime),
|
||||
ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime),
|
||||
WorkPalce = newItem.WorkPalce,
|
||||
WorkMeasures = newItem.WorkMeasures,
|
||||
FireWatchManId = newItem.FireWatchManId,
|
||||
FireWatchManName=newItem.FireWatchManName,
|
||||
WatchManContact = newItem.WatchManContact,
|
||||
CancelManId = newItem.CancelManId,
|
||||
CancelReasons = newItem.CancelReasons,
|
||||
|
|
@ -1723,12 +1734,14 @@ namespace BLL
|
|||
{
|
||||
updateRadialWork.RadialType = newRadialWork.RadialType;
|
||||
updateRadialWork.WorkLeaderId = newRadialWork.WorkLeaderId;
|
||||
updateRadialWork.WorkLeaderName = newRadialWork.WorkLeaderName;
|
||||
updateRadialWork.WorkLeaderTel = newRadialWork.WorkLeaderTel;
|
||||
updateRadialWork.ValidityStartTime = newRadialWork.ValidityStartTime;
|
||||
updateRadialWork.ValidityEndTime = newRadialWork.ValidityEndTime;
|
||||
updateRadialWork.WorkPalce = newRadialWork.WorkPalce;
|
||||
updateRadialWork.WorkMeasures = newRadialWork.WorkMeasures;
|
||||
updateRadialWork.FireWatchManId = newRadialWork.FireWatchManId;
|
||||
updateRadialWork.FireWatchManName = newRadialWork.FireWatchManName;
|
||||
updateRadialWork.WatchManContact = newRadialWork.WatchManContact;
|
||||
updateRadialWork.NextManId = newRadialWork.NextManId;
|
||||
updateRadialWork.States = newRadialWork.States;
|
||||
|
|
|
|||
|
|
@ -12,15 +12,17 @@
|
|||
|3 |气带、电线等符合要求 | | |
|
||||
|4 |电焊回路线接在焊件上，地线不得穿过下水井| | |
|
||||
| |或与其它设备搭接 | | |
|
||||
|5 |清除动火点周围易燃物或采取有效的防护措施| | |
|
||||
|6 |气瓶直立固定并有防晒措施 | | |
|
||||
|7 |乙炔、氧气瓶间距不小于5米，与火源距离不 | | |
|
||||
|5 |安装电工绝缘鞋、绝缘手套等个人劳动防护用| | |
|
||||
| |品齐全有效。 | | |
|
||||
|6 |清除动火点周围易燃物或采取有效的防护措施| | |
|
||||
|7 |气瓶直立固定并有防晒措施 | | |
|
||||
|8 |乙炔、氧气瓶间距不小于5米，与火源距离不 | | |
|
||||
| |小于10米 | | |
|
||||
|8 |动火作业现场备灭火器（）个，其他消防器材| | |
|
||||
|9 |高处作业须采取防火花飞溅措施 | | |
|
||||
|10 |现场人员会使用灭火器 | | |
|
||||
|11 |作业点已进行可燃气体检测 | | |
|
||||
|12 |其它措施 | | |
|
||||
|9 |动火作业现场备灭火器（）个，其他消防器材| | |
|
||||
|10 |高处作业须采取防火花飞溅措施 | | |
|
||||
|11 |现场人员会使用灭火器 | | |
|
||||
|12 |作业点已进行可燃气体检测 | | |
|
||||
|13 |其它措施 | | |
|
||||
|施工单位安全人员意见： |总包单位安全人员意见： |
|
||||
| | |
|
||||
| | |
|
||||
|
|
|
|||
|
|
@ -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 = "×";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//审核记录
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -216095,6 +216095,10 @@ namespace Model
|
|||
|
||||
private string _SignatureUrl;
|
||||
|
||||
private string _WorkLeaderName;
|
||||
|
||||
private string _FireWatchManName;
|
||||
|
||||
private EntityRef<Base_Project> _Base_Project;
|
||||
|
||||
private EntityRef<Base_Unit> _Base_Unit;
|
||||
|
|
@ -216165,6 +216169,10 @@ namespace Model
|
|||
partial void OnWorkAreaIdChanged();
|
||||
partial void OnSignatureUrlChanging(string value);
|
||||
partial void OnSignatureUrlChanged();
|
||||
partial void OnWorkLeaderNameChanging(string value);
|
||||
partial void OnWorkLeaderNameChanged();
|
||||
partial void OnFireWatchManNameChanging(string value);
|
||||
partial void OnFireWatchManNameChanged();
|
||||
#endregion
|
||||
|
||||
public License_RadialWork()
|
||||
|
|
@ -216727,6 +216735,46 @@ namespace Model
|
|||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(50)")]
|
||||
public string WorkLeaderName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._WorkLeaderName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._WorkLeaderName != value))
|
||||
{
|
||||
this.OnWorkLeaderNameChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._WorkLeaderName = value;
|
||||
this.SendPropertyChanged("WorkLeaderName");
|
||||
this.OnWorkLeaderNameChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(50)")]
|
||||
public string FireWatchManName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FireWatchManName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._FireWatchManName != value))
|
||||
{
|
||||
this.OnFireWatchManNameChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._FireWatchManName = value;
|
||||
this.SendPropertyChanged("FireWatchManName");
|
||||
this.OnFireWatchManNameChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_RadialWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
|
||||
public Base_Project Base_Project
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue