0414-001
This commit is contained in:
gaofei
@@ -80,6 +80,9 @@
|
||||
SortField="WorkAreaName" FieldType="String" HeaderText="单位工程" TextAlign="Left"
|
||||
HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Left"
|
||||
HeaderTextAlign="Center" Width="100px">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" ExpandUnusedSpace="true"
|
||||
SortField="UnitName" FieldType="String" HeaderText="受检单位名称" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -74,13 +74,14 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT R.RectifyNoticesId,R.ProjectId,R.RectifyNoticesCode,R.UnitId ,Unit.UnitName,R.WorkAreaId,R.CheckManNames,R.CheckManIds
|
||||
string strSql = @"SELECT R.RectifyNoticesId,R.ProjectId,R.RectifyNoticesCode,R.UnitId ,CN.ProfessionalName,Unit.UnitName,R.WorkAreaId,R.CheckManNames,R.CheckManIds
|
||||
,WorkAreaName= STUFF(( SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +R.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''),CheckPersonName= (STUFF(( SELECT ',' + UserName FROM dbo.Sys_User where PATINDEX('%,' + RTRIM(UserId) + ',%',',' +R.CheckManIds+ ',')>0 FOR XML PATH('')), 1, 1,'')+ (CASE WHEN CheckManNames IS NOT NULL AND CheckManNames !='' THEN ','+ CheckManNames ELSE '' END)),R.DutyPerson,R.CheckedDate,DutyPerson.UserName AS DutyPersonName,R.DutyPersonTime,R.CompleteDate
|
||||
,(CASE WHEN States = 0 THEN '待['+CompileMan.UserName+']提交' WHEN States = 1 THEN '待['+SignMan.UserName+']签发' WHEN States = 2 THEN '待['+DutyPerson.UserName+']整改' WHEN States = 3 THEN '待['+UnitHeadMan.UserName+']审核' WHEN States = 4 THEN '待['+CheckPerson.UserName+']复查' WHEN States = 5 THEN '已完成' ELSE '' END) AS StatesName
|
||||
FROM Check_RectifyNotices AS R
|
||||
LEFT JOIN Base_Project AS Project ON Project.ProjectId = R.ProjectId
|
||||
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = R.UnitId
|
||||
LEFT JOIN Sys_User AS CompileMan ON CompileMan.UserId=R.CompleteManId
|
||||
LEFT JOIN Base_CNProfessional AS CN ON CN.CNProfessionalId=R.CNProfessionalId
|
||||
LEFT JOIN Sys_User AS SignMan ON SignMan.UserId=R.SignPerson
|
||||
LEFT JOIN Sys_User AS DutyPerson ON DutyPerson.UserId = R.DutyPersonId
|
||||
LEFT JOIN Sys_User AS UnitHeadMan ON UnitHeadMan.UserId = R.UnitHeadManId
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
<f:ListItem Text="较大" Value="2" />
|
||||
<f:ListItem Text="重大" Value="3" />
|
||||
</f:DropDownList>
|
||||
<f:Label runat="server" ></f:Label>
|
||||
<f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right"></f:DropDownList>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_CWCEC, true);
|
||||
///检察人员
|
||||
BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true);
|
||||
//专业
|
||||
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
|
||||
//Funs.FineUIPleaseSelect(drpIsRectify);
|
||||
RectifyNoticesId = Request.Params["RectifyNoticesId"];
|
||||
var getRectifyNotices = RectifyNoticesService.GetRectifyNoticesById(RectifyNoticesId);
|
||||
@@ -65,6 +67,10 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
this.drpCheckMan.SelectedValueArray = getRectifyNotices.CheckManIds.Split(',');
|
||||
}
|
||||
this.txtCheckPerson.Text = getRectifyNotices.CheckManNames;
|
||||
if (!string.IsNullOrEmpty(getRectifyNotices.CNProfessionalId))
|
||||
{
|
||||
this.drpCNProfessionalId.SelectedValue = getRectifyNotices.CNProfessionalId;
|
||||
}
|
||||
this.txtRectifyNoticesCode.Text = getRectifyNotices.RectifyNoticesCode;
|
||||
this.txtCheckedDate.Text = getRectifyNotices.CheckedDate.ToString();
|
||||
if (!string.IsNullOrEmpty(getRectifyNotices.SignPerson))
|
||||
@@ -254,7 +260,10 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
newRectifyNotices.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
|
||||
}
|
||||
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
newRectifyNotices.UnitId = this.drpUnitId.SelectedValue;
|
||||
|
||||
@@ -156,6 +156,15 @@ namespace FineUIPro.Web.HSSE.Check {
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpHiddenHazardType;
|
||||
|
||||
/// <summary>
|
||||
/// drpCNProfessionalId 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCNProfessionalId;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -49,6 +49,8 @@
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="drpHiddenHazardType" runat="server" Label="隐患类别" LabelWidth="110px" Readonly="true">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtProfessionalName" runat="server" Label="专业" LabelWidth="110px" Readonly="true">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
{
|
||||
this.RectifyNoticesId = Request.Params["RectifyNoticesId"];
|
||||
if (!string.IsNullOrEmpty(RectifyNoticesId))
|
||||
{
|
||||
@@ -35,7 +35,12 @@ namespace FineUIPro.Web.HSSE.Check
|
||||
this.txtWorkAreaId.Text = BLL.UnitWorkService.GetUnitWorkName(getRectifyNotices.WorkAreaId);
|
||||
this.txtCheckPerson.Text = getRectifyNotices.CheckManNames;
|
||||
this.txtRectifyNoticesCode.Text = getRectifyNotices.RectifyNoticesCode;
|
||||
this.txtCheckedDate.Text =string.Format("{0:yyyy-MM-dd}",getRectifyNotices.CheckedDate);
|
||||
this.txtCheckedDate.Text = string.Format("{0:yyyy-MM-dd}", getRectifyNotices.CheckedDate);
|
||||
Model.Base_CNProfessional cn = BLL.CNProfessionalService.GetCNProfessional(getRectifyNotices.CNProfessionalId);
|
||||
if (cn != null)
|
||||
{
|
||||
this.txtProfessionalName.Text = cn.ProfessionalName;
|
||||
}
|
||||
this.drpHiddenHazardType.Text = "一般";
|
||||
if (getRectifyNotices.HiddenHazardType == "2")
|
||||
{
|
||||
|
||||
@@ -120,6 +120,15 @@ namespace FineUIPro.Web.HSSE.Check {
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox drpHiddenHazardType;
|
||||
|
||||
/// <summary>
|
||||
/// txtProfessionalName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtProfessionalName;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user