0414-001

SGGL/FineUIPro.Web/HSSE/License/LicenseManager.aspx

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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>