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

0414-001

Browse Source
This commit is contained in:
gaofei
2022-04-14 11:15:34 +08:00
parent 274010da92
commit 8e73412eb6
49 changed files with 1609 additions and 2301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx
+3
View File
@@ -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>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
+2 -1
View File
@@ -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
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx
+1 -1
View File
@@ -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>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
+10 -1
View File
@@ -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;
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx
+2
View File
@@ -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>
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx.cs
+7 -2
View File
@@ -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")
{
SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesView.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx
+9
View File
@@ -74,6 +74,12 @@
<asp:Label ID="lblUnitId" runat="server" Text='<%# ConvertUnitName(Eval("UnitIds")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:TemplateField ColumnID="UnitWork" Width="300px" HeaderText="单位工程" HeaderTextAlign="Center"
TextAlign="left">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertUnitWorkName(Eval("UnitWorkIds")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="110px" ColumnID="TrainTypeName" DataField="TrainTypeName" SortField="TrainTypeName"
FieldType="String" HeaderText="培训类型" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
@@ -84,6 +90,9 @@
SortField="TrainStartDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
HeaderText="培训日期" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProfessionalName" DataField="ProfessionalName" SortField="ProfessionalName"
FieldType="String" HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<%-- <f:RenderField Width="65px" ColumnID="TeachHour" DataField="TeachHour" SortField="TeachHour"
FieldType="Float" HeaderText="学时" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.cs
+33
View File
@@ -80,6 +80,8 @@ namespace FineUIPro.Web.HSSE.EduTrain
+ @",TrainRecord.TrainEndDate"
+ @",TrainRecord.TeachHour"
+ @",TrainRecord.TeachMan"
+ @",TrainRecord.UnitWorkIds"
+ @",CN.ProfessionalName"
+ @",TrainRecord.TrainPersonNum"
+ @",TrainingCode"
// + @",CodeRecords.Code AS TrainingCode"
@@ -89,6 +91,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON TrainRecord.TrainingId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId "
+ @" LEFT JOIN Base_TrainType AS TrainType ON TrainRecord.TrainTypeId=TrainType.TrainTypeId "
+ @" LEFT JOIN Base_CNProfessional AS CN ON TrainRecord.CNProfessionalId=CN.CNProfessionalId "
+ @" LEFT JOIN Base_TrainLevel AS TrainLevel ON TrainRecord.TrainLevelId=TrainLevel.TrainLevelId "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON TrainRecord.TrainingId=CodeRecords.DataId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -459,6 +462,36 @@ namespace FineUIPro.Web.HSSE.EduTrain
}
return unitName;
}
/// <summary>
/// 获取单位工程名称
/// </summary>
/// <param name="unitIds"></param>
/// <returns></returns>
protected string ConvertUnitWorkName(object unitWorkIds)
{
string unitWorkName = string.Empty;
if (unitWorkIds != null)
{
List<string> infos = unitWorkIds.ToString().Split(',').ToList();
if (infos.Count() > 0)
{
foreach (var item in infos)
{
Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(item);
if (unitWork != null)
{
unitWorkName += unitWork.UnitWorkName + ",";
}
}
if (!string.IsNullOrEmpty(unitWorkName))
{
unitWorkName = unitWorkName.Substring(0, unitWorkName.LastIndexOf(","));
}
}
}
return unitWorkName;
}
#endregion
#region 查询事件
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecord.aspx.designer.cs
Generated
+9
View File
@@ -174,6 +174,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblUnitId;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx
+3
View File
@@ -42,12 +42,15 @@
<Items>
<f:TextBox ID="txtTrainTitle" runat="server" Label="标题" MaxLength="200" >
</f:TextBox>
<f:DropDownList ID="drpUnitWork" runat="server" Label="单位工程" EnableCheckBoxSelect="true" EnableMultiSelect="true">
</f:DropDownList>
<f:TextBox ID="txtTeachAddress" runat="server" Label="培训地点" MaxLength="100">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right"></f:DropDownList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="培训日期" ID="txtTrainStartDate">
</f:DatePicker>
<f:NumberBox ID="txtTrainPersonNum" NoDecimal="true" NoNegative="true" MinValue="0" Readonly="true" runat="server" Label="培训人数" >
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
+25 -8
View File
@@ -23,7 +23,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
ViewState["TrainingId"] = value;
}
}
/// <summary>
/// 主键
/// </summary>
@@ -84,6 +84,14 @@ namespace FineUIPro.Web.HSSE.EduTrain
this.InitDropDownList();
}
this.txtTrainingCode.Text = BLL.CodeRecordsService.ReturnCodeByDataId(this.TrainingId);
if (!string.IsNullOrEmpty(trainRecord.CNProfessionalId))
{
this.drpCNProfessionalId.SelectedValue = trainRecord.CNProfessionalId;
}
if (!string.IsNullOrEmpty(trainRecord.UnitWorkIds))
{
this.drpUnitWork.SelectedValueArray = trainRecord.UnitWorkIds.Split(',');
}
if (!string.IsNullOrEmpty(trainRecord.TrainTypeId))
{
this.drpTrainType.SelectedValue = trainRecord.TrainTypeId;
@@ -163,7 +171,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
isRed = false;
}
if(isRed)
if (isRed)
{
var getRecordDetail = trainRecordDetails.FirstOrDefault(x => x.TrainDetailId == trainDetailId);
if (getRecordDetail != null && !string.IsNullOrEmpty(this.TestPlanId)) ////未参加过培训的人员
@@ -172,7 +180,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
if (getTestRecord != null)
{
isRed = false;
}
}
}
}
if (isRed)
@@ -193,6 +201,10 @@ namespace FineUIPro.Web.HSSE.EduTrain
TrainLevelService.InitTrainLevelDropDownList(this.drpTrainLevel, true);
//培训单位
UnitService.InitUnitDropDownList(this.drpUnits, this.ProjectId, false);
//专业
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
//单位工程
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWork, this.CurrUser.LoginProjectId, true);
WorkPostService.InitWorkPostDropDownList(this.drpWorkPostIds, true);
this.drpUnits.SelectedValue = this.CurrUser.UnitId;
}
@@ -204,7 +216,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSelect_Click(object sender, EventArgs e)
{
{
if (string.IsNullOrEmpty(this.TrainingId))
{
this.SaveData(BLL.Const.BtnSave);
@@ -297,10 +309,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
trainRecord.TrainTypeId = this.drpTrainType.SelectedValue;
}
trainRecord.UnitWorkIds = Funs.GetStringByArray(this.drpUnitWork.SelectedValueArray);
if (this.drpTrainLevel.SelectedValue != BLL.Const._Null)
{
trainRecord.TrainLevelId = this.drpTrainLevel.SelectedValue;
}
}
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
trainRecord.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
//培训单位
string unitIds = string.Empty;
foreach (var item in this.drpUnits.SelectedValueArray)
@@ -378,7 +395,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
BLL.EduTrain_TrainRecordDetailService.UpdateTrainDetail(detail);
}
}
if (i == 0)
{
////保存流程审核数据
@@ -417,7 +434,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
}
this.Grid1DataBind();
this.txtTrainPersonNum.Text = trainRecordDetails.Count.ToString();
this.txtTrainPersonNum.Text = trainRecordDetails.Count.ToString();
this.ShowNotify("删除数据成功!（表格数据已重新绑定）");
}
}
@@ -471,7 +488,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("TrainTestView.aspx?TrainDetailId={0}", rowID, "查看试卷 - ")));
}
}
}
}
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.designer.cs
Generated
+18
View File
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
/// </remarks>
protected global::FineUIPro.TextBox txtTrainTitle;
/// <summary>
/// drpUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWork;
/// <summary>
/// txtTeachAddress 控件。
/// </summary>
@@ -93,6 +102,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
/// </remarks>
protected global::FineUIPro.TextBox txtTeachAddress;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// txtTrainStartDate 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordView.aspx
+5 -1
View File
@@ -41,16 +41,20 @@
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="33% 67%">
<f:FormRow>
<Items>
<f:TextBox ID="txtTrainTitle" runat="server" Label="标题" MaxLength="200" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtUnitWork" runat="server" Label="单位工程" MaxLength="100" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtTeachAddress" runat="server" Label="培训地点" MaxLength="100" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProfessionalName" runat="server" Label="专业" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtTrainStartDate" runat="server" Label="培训日期" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtTrainPersonNum" runat="server" Label="培训人数" Readonly="true">
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordView.aspx.cs
+9
View File
@@ -70,6 +70,15 @@ namespace FineUIPro.Web.HSSE.EduTrain
{
this.txtTrainLevel.Text = trainLevel.TrainLevelName;
}
Model.Base_CNProfessional cn = BLL.CNProfessionalService.GetCNProfessional(trainRecord.CNProfessionalId);
if (cn != null)
{
this.txtProfessionalName.Text = cn.ProfessionalName;
}
if (!string.IsNullOrEmpty(trainRecord.UnitWorkIds))
{
this.txtUnitWork.Text = BLL.UnitWorkService.GetUnitWorkName(trainRecord.UnitWorkIds);
}
this.txtTrainTitle.Text = trainRecord.TrainTitle;
if (!string.IsNullOrEmpty(trainRecord.UnitIds))
{
SGGL/FineUIPro.Web/HSSE/EduTrain/TrainRecordView.aspx.designer.cs
Generated
+18
View File
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
/// </remarks>
protected global::FineUIPro.TextBox txtTrainTitle;
/// <summary>
/// txtUnitWork 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtUnitWork;
/// <summary>
/// txtTeachAddress 控件。
/// </summary>
@@ -93,6 +102,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
/// </remarks>
protected global::FineUIPro.TextBox txtTeachAddress;
/// <summary>
/// txtProfessionalName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProfessionalName;
/// <summary>
/// txtTrainStartDate 控件。
/// </summary>
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx
+3
View File
@@ -65,6 +65,9 @@
<f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Left"
HeaderTextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="WorkAreaName" DataField="WorkAreaName" SortField="WorkAreaName"
FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace FineUIPro.Web.HSSE.License
/// </summary>
private void BindGrid()
{
string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.LicenseTypeId,CodeRecords.Code AS LicenseManagerCode,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate"
string strSql = "SELECT LicenseManager.LicenseManagerId,LicenseManager.ProjectId,LicenseManager.LicenseTypeId,LicenseManager.ProfessionalName,CodeRecords.Code AS LicenseManagerCode,LicenseManager.LicenseManageName,LicenseManager.UnitId,LicenseManager.LicenseManageContents,LicenseManager.CompileMan,LicenseManager.CompileDate,LicenseManager.States,LicenseManager.ProjectCode,LicenseManager.ProjectName,LicenseManager.LicenseTypeName,LicenseManager.UnitName,LicenseManager.UserName,LicenseManager.WorkAreaName,LicenseManager.StartDate,LicenseManager.EndDate"
+ @" ,(CASE WHEN LicenseManager.States = " + BLL.Const.State_0 + " OR LicenseManager.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN LicenseManager.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM View_License_LicenseManager AS LicenseManager "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON LicenseManager.LicenseManagerId=CodeRecords.DataId "
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx
+2 -1
View File
@@ -16,7 +16,7 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="34% 66%">
<f:FormRow>
<Items>
<f:TextBox ID="txtLicenseManagerCode" runat="server" Label="许可证编号" LabelAlign="Right"
MaxLength="50" Readonly="true">
@@ -24,6 +24,7 @@
<f:DropDownList ID="drpUnitId" runat="server" Label="申请单位" LabelAlign="Right" Required="true"
ShowRedStar="true" ForceSelection="false" EnableEdit="true" FocusOnPageLoad="true">
</f:DropDownList>
<f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelWidth="150px" LabelAlign="Right"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="34% 33% 33%">
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.cs
+9 -1
View File
@@ -67,6 +67,10 @@ namespace FineUIPro.Web.HSSE.License
{
this.drpUnitId.SelectedValue = licenseManager.UnitId;
}
if (!string.IsNullOrEmpty(licenseManager.CNProfessionalId))
{
this.drpCNProfessionalId.SelectedValue = licenseManager.CNProfessionalId;
}
if (!string.IsNullOrEmpty(licenseManager.LicenseTypeId))
{
this.drpLicenseTypeId.SelectedValue = licenseManager.LicenseTypeId;
@@ -114,6 +118,7 @@ namespace FineUIPro.Web.HSSE.License
private void InitDropDownList()
{
UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
LicenseTypeService.InitLicenseTypeDropDownList(this.drpLicenseTypeId, true);
UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.ProjectId, false);
}
@@ -177,7 +182,10 @@ namespace FineUIPro.Web.HSSE.License
{
licenseManager.UnitId = this.drpUnitId.SelectedValue;
}
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
licenseManager.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
licenseManager.ApplicantMan = this.txtApplicantMan.Text.Trim();
if (!string.IsNullOrEmpty(this.drpWorkAreaId.SelectedValue))
{
SGGL/FineUIPro.Web/HSSE/License/LicenseManagerEdit.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.HSSE.License {
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpCNProfessionalId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCNProfessionalId;
/// <summary>
/// drpLicenseTypeId 控件。
/// </summary>