修改进度报表

DataBase/版本日志/SGGLDB_WH_2023-05-20.sql

@@ -0,0 +1,260 @@
+
+CREATE TABLE [dbo].[Meeting_CompanySafetyMeeting](
+	[CompanySafetyMeetingId] [nvarchar](50) NOT NULL,
+	[CompanySafetyMeetingCode] [nvarchar](50) NULL,
+	[CompanySafetyMeetingName] [nvarchar](50) NULL,
+	[CompanySafetyMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompanySafetyMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_CompanySafetyMeeting] PRIMARY KEY CLUSTERED 
+(
+	[CompanySafetyMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'整理人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompanySafetyMeetingContents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参会人数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主持人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参与人员' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议地点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主持人Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参与人员id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'其他主持人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'企业安委会' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySafetyMeeting'
+GO
+
+
+
+CREATE TABLE [dbo].[Meeting_CompanySpecialMeeting](
+	[CompanySpecialMeetingId] [nvarchar](50) NOT NULL,
+	[CompanySpecialMeetingCode] [nvarchar](50) NULL,
+	[CompanySpecialMeetingName] [nvarchar](50) NULL,
+	[CompanySpecialMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompanySpecialMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_CompanySpecialMeeting] PRIMARY KEY CLUSTERED 
+(
+	[CompanySpecialMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'整理人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议内容' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompanySpecialMeetingContents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参会人数' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主持人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参与人员' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议地点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingPlace'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主持人Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'参与人员id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonIds'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'其他主持人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting', @level2type=N'COLUMN',@level2name=N'MeetingHostManOther'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'企业专题会' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CompanySpecialMeeting'
+GO
+
+
+
+CREATE TABLE [dbo].[Meeting_SafetyLeaderGroupMeeting](
+	[SafetyLeaderGroupMeetingId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingCode] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingName] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingDate] [datetime] NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[SafetyLeaderGroupMeetingContents] [nvarchar](max) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttentPersonNum] [int] NULL,
+	[MeetingHours] [decimal](9, 1) NULL,
+	[MeetingHostMan] [nvarchar](50) NULL,
+	[AttentPerson] [nvarchar](300) NULL,
+	[MeetingPlace] [nvarchar](200) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[MeetingHostManId] [nvarchar](50) NULL,
+	[AttentPersonIds] [nvarchar](4000) NULL,
+	[MeetingHostManOther] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Meeting_SafetyLeaderGroupMeeting] PRIMARY KEY CLUSTERED 
+(
+	[SafetyLeaderGroupMeetingId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'会议日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'SafetyLeaderGroupMeetingDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编制人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'安全领导小组会议表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_SafetyLeaderGroupMeeting'
+GO
+
+
+
+CREATE TABLE [dbo].[Emergency_EmergencyList_Unit](
+	[EmergencyListId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[EmergencyCode] [nvarchar](50) NULL,
+	[EmergencyName] [nvarchar](500) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[EmergencyTypeId] [nvarchar](50) NULL,
+	[VersionCode] [nvarchar](50) NULL,
+	[EmergencyContents] [nvarchar](max) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttachUrl] [nvarchar](2000) NULL,
+	[AuditMan] [nvarchar](50) NULL,
+	[ApproveMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_EmergencyList_Unit_EmergencyListId] PRIMARY KEY CLUSTERED 
+(
+	[EmergencyListId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+
+
+CREATE TABLE [dbo].[Emergency_DrillRecordList_Unit](
+	[DrillRecordListId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[DrillRecordCode] [nvarchar](50) NULL,
+	[DrillRecordName] [nvarchar](500) NULL,
+	[UnitIds] [nvarchar](4000) NULL,
+	[UnitNames] [nvarchar](4000) NULL,
+	[UserIds] [nvarchar](4000) NULL,
+	[UserNames] [nvarchar](4000) NULL,
+	[DrillRecordDate] [datetime] NULL,
+	[DrillRecordContents] [nvarchar](max) NULL,
+	[CompileMan] [nvarchar](50) NULL,
+	[CompileDate] [datetime] NULL,
+	[States] [char](1) NULL,
+	[AttachUrl] [nvarchar](2000) NULL,
+	[DrillRecordType] [char](1) NULL,
+	[JointPersonNum] [int] NULL,
+	[DrillCost] [decimal](9, 2) NULL,
+ CONSTRAINT [PK_DrillRecordList_Unit_DrillRecordListId] PRIMARY KEY CLUSTERED 
+(
+	[DrillRecordListId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+

SGGL/BLL/BaseInfo/TrainTypeService.cs

@@ -34,6 +34,7 @@ namespace BLL
                 TrainTypeId = trainType.TrainTypeId,
                 TrainTypeCode = trainType.TrainTypeCode,
                 TrainTypeName = trainType.TrainTypeName,
+                TrainType = trainType.TrainType,
                 Remark = trainType.Remark,
                 IsAboutSendCard = trainType.IsAboutSendCard,
                 IsRepeat = trainType.IsRepeat
@@ -54,6 +55,7 @@ namespace BLL
             {
                 newTrainType.TrainTypeCode = trainType.TrainTypeCode;
                 newTrainType.TrainTypeName = trainType.TrainTypeName;
+                newTrainType.TrainType = trainType.TrainType;
                 newTrainType.Remark = trainType.Remark;
                 newTrainType.IsAboutSendCard = trainType.IsAboutSendCard;
                 newTrainType.IsRepeat = trainType.IsRepeat;

SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtAccidentTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/AccidentType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtAccidentTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtCertificateCode" Label="编号" ShowRedStar="true" Required="true"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtCertificateCode 控件。

SGGL/FineUIPro.Web/BaseInfo/CostType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtCostTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/CostType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtCostTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtEmergencyTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"  MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/EmergencyType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtEmergencyTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx

@@ -57,8 +57,7 @@
                 <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                     LabelWidth="80px" BodyPadding="5px" Width="350px">
                     <Items>
-                        <f:HiddenField ID="hfFormID" runat="server">
+                        <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                        </f:HiddenField>
                         <f:TextBox ID="txtGoodsCategoryCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                             LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" FocusOnPageLoad="true">
                         </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/GoodsCategory.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtGoodsCategoryCode 控件。

SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx

@@ -57,8 +57,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="360px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="tbxTypeCode" Label="编号" ShowRedStar="true"  LabelWidth="80px"
                         Required="true" runat="server"  MaxLength="50" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/HSSEStandardListType.aspx.designer.cs

@@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// tbxTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtCode" Label="编号" ShowRedStar="true" Required="true" runat="server"  MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/LawsRegulationsType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtCode 控件。

SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="60px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtLicenseTypeCode" Label="编号" ShowRedStar="true" Required="true" FocusOnPageLoad="true"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/LicenseType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtLicenseTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx

@@ -51,8 +51,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtManageRuleTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"  MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/ManageRuleType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtManageRuleTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx

@@ -53,8 +53,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/PictureType.aspx.designer.cs

@@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtCode 控件。

SGGL/FineUIPro.Web/BaseInfo/Position.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtPositionCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" FocusOnPageLoad="true">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/Position.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtPositionCode 控件。

SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx

@@ -55,8 +55,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtPostTitleCode" Label="编号" ShowRedStar="true" Required="true" runat="server"   MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/PostTitle.aspx.designer.cs

@@ -100,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtPostTitleCode 控件。

SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx

@@ -46,8 +46,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtPracticeCertificateCode" Label="编号" ShowRedStar="true" Required="true"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/PracticeCertificate.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtPracticeCertificateCode 控件。

SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx

@@ -46,8 +46,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtProjectTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"   MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/ProjectType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtProjectTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx

@@ -52,8 +52,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtQuestionTypeCode" Label="编号" ShowRedStar="true" Required="true"  MaxLength="50"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/QuestionType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtQuestionTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtRulesRegulationsTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server" MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/RulesRegulationsType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtRulesRegulationsTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx

@@ -48,8 +48,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtSolutionTempleteTypeCode" Label="编号" ShowRedStar="true" Required="true"
                         runat="server" MaxLength="50" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
                         LabelWidth="80px">

SGGL/FineUIPro.Web/BaseInfo/SolutionTempleteType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtSolutionTempleteTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx

@@ -62,8 +62,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtSpecialEquipmentCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="80px">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/SpecialEquipment.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtSpecialEquipmentCode 控件。

SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx

@@ -51,8 +51,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtSpecialSchemeTypeCode" Label="编号" ShowRedStar="true" Required="true"  MaxLength="50"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/SpecialSchemeType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtSpecialSchemeTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx

@@ -46,8 +46,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtTrainLevelCode" Label="编号" ShowRedStar="true" Required="true" runat="server" LabelWidth="110px"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/TrainLevel.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtTrainLevelCode 控件。

SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx

@@ -23,6 +23,14 @@
                         </f:RenderField>
                         <f:RenderField Width="250px" ColumnID="TrainTypeName" DataField="TrainTypeName" FieldType="String"
                             HeaderText="名称" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:TemplateField Width="120px" HeaderText="类别" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label1" runat="server" Text='<%# ConvertTrainType(Eval("TrainType")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField Width="10px" ColumnID="TrainType" DataField="TrainType" FieldType="String"
+                        HeaderText="类别" HeaderTextAlign="Center" TextAlign="Left" Hidden="true">
                     </f:RenderField>
                         <f:RenderField Width="80px" ColumnID="IsAboutSendCard" DataField="IsAboutSendCard" FieldType="Boolean"
                             RendererFunction="renderIsOrNo" HeaderText="关联发卡" HeaderTextAlign="Center" TextAlign="Center">
@@ -51,14 +59,19 @@
                 <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                     LabelWidth="80px" BodyPadding="5px" Width="350px">
                     <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                        <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                         <f:TextBox ID="txtTrainTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"
                             LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="100px">
                         </f:TextBox>
                         <f:TextBox ID="txtTrainTypeName" Label="名称" ShowRedStar="true" Required="true" runat="server"
                             LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelWidth="100px">
                         </f:TextBox>
+                        <f:DropDownList ID="drpTrainType" runat="server" Label="类别" LabelAlign="Right" Required="true"
+                            ShowRedStar="true" LabelWidth="100px">
+                            <f:ListItem Value="1" Text="三级安全教育培训" />
+                            <f:ListItem Value="2" Text="专项培训" />
+                            <f:ListItem Value="3" Text="特种作业培训" />
+                        </f:DropDownList>
                         <f:CheckBox ID="ckbIsAboutSendCard" runat="server" Label="关联发卡" LabelAlign="right" LabelWidth="100px">
                         </f:CheckBox>
                         <f:CheckBox ID="ckbIsRepeat" runat="server" Label="多次培训" LabelAlign="right" LabelWidth="100px">
@@ -128,6 +141,7 @@
         var hfFormIDClientID = '<%= hfFormID.ClientID %>';
         var txtCodeClientID = '<%= txtTrainTypeCode.ClientID %>';
         var txtNameClientID = '<%= txtTrainTypeName.ClientID %>';
+        var drpTrainTypeClientID = '<%= drpTrainType.ClientID %>';
         var ckbIsAboutSendCardClientID = '<%= ckbIsAboutSendCard.ClientID %>';
         var ckbIsRepeatClientID = '<%= ckbIsRepeat.ClientID %>';
         var txtRemarkClientID = '<%=txtRemark.ClientID %>';
@@ -145,6 +159,7 @@
             F(hfFormIDClientID).setValue(rowId);
             F(txtCodeClientID).setValue(rowValue['TrainTypeCode']);
             F(txtNameClientID).setValue(rowValue['TrainTypeName']);
+            F(drpTrainTypeClientID).setValue(rowValue['TrainType']);
             F(ckbIsAboutSendCardClientID).setValue(rowValue['IsAboutSendCard']);
             F(ckbIsRepeatClientID).setValue(rowValue['IsRepeat']);
             F(txtRemarkClientID).setValue(rowValue['Remark']);

SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.cs

@@ -13,6 +13,7 @@ namespace FineUIPro.Web.BaseInfo
             {
                 ////权限按钮方法
                 this.GetButtonPower();
+                Funs.FineUIPleaseSelect(this.drpTrainType);
                 Funs.DropDownPageSize(this.ddlPageSize);
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
@@ -210,6 +211,10 @@ namespace FineUIPro.Web.BaseInfo
             {
                 newTrainType.IsRepeat = false;
             }
+            if (this.drpTrainType.SelectedValue != BLL.Const._Null)
+            {
+                newTrainType.TrainType = this.drpTrainType.SelectedValue;
+            }
             newTrainType.Remark = txtRemark.Text.Trim();
             if (string.IsNullOrEmpty(strRowID))
             {
@@ -332,5 +337,34 @@ namespace FineUIPro.Web.BaseInfo
             
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainTypeEdit.aspx?TrainTypeId={0}", Grid1.SelectedRowID, "设置 - ")));
         }
+
+        #region 格式化字符串
+        /// <summary>
+        /// 格式化字符串
+        /// </summary>
+        /// <param name="WorkStage"></param>
+        /// <returns></returns>
+        protected string ConvertTrainType(object TrainType)
+        {
+            string name = string.Empty;
+            if (TrainType != null)
+            {
+                string trainType = TrainType.ToString().Trim();
+                if (trainType == "1")
+                {
+                    name = "三级安全教育培训";
+                }
+                else if (trainType == "2")
+                {
+                    name = "专项培训";
+                }
+                if (trainType == "3")
+                {
+                    name = "特种作业培训";
+                }
+            }
+            return name;
+        }
+        #endregion
     }
 }

SGGL/FineUIPro.Web/BaseInfo/TrainType.aspx.designer.cs

@@ -48,6 +48,15 @@ namespace FineUIPro.Web.BaseInfo {
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
         
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+        
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -91,7 +100,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtTrainTypeCode 控件。
@@ -111,6 +120,15 @@ namespace FineUIPro.Web.BaseInfo {
         /// </remarks>
         protected global::FineUIPro.TextBox txtTrainTypeName;
         
+        /// <summary>
+        /// drpTrainType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpTrainType;
+        
         /// <summary>
         /// ckbIsAboutSendCard 控件。
         /// </summary>

SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx

@@ -45,8 +45,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtUnitTypeCode" Label="编号" ShowRedStar="true" Required="true" runat="server"   MaxLength="50"
                         LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/UnitType.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtUnitTypeCode 控件。

SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx

@@ -68,8 +68,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="80px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:DropDownList ID="drpWorkPostCode" runat="server" Label="编号" LabelAlign="Right" Required="true"
                         ShowRedStar="true" LabelWidth="80px">
                     </f:DropDownList>

SGGL/FineUIPro.Web/BaseInfo/WorkPost.aspx.designer.cs

@@ -109,7 +109,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// drpWorkPostCode 控件。

SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx

@@ -47,8 +47,7 @@
             <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
                 LabelWidth="110px" BodyPadding="5px" Width="350px">
                 <Items>
-                    <f:HiddenField ID="hfFormID" runat="server">
+                    <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
-                    </f:HiddenField>
                     <f:TextBox ID="txtWorkStageCode" Label="编号" ShowRedStar="true" Required="true"
                         runat="server" LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                     </f:TextBox>

SGGL/FineUIPro.Web/BaseInfo/WorkStage.aspx.designer.cs

@@ -91,7 +91,7 @@ namespace FineUIPro.Web.BaseInfo {
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.HiddenField hfFormID;
+        protected global::FineUIPro.TextBox hfFormID;
         
         /// <summary>
         /// txtWorkStageCode 控件。

SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs

@@ -208,6 +208,7 @@ namespace Web.Controls
             chartArea.AxisY.IsLabelAutoFit = false;
             chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
             chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
+            chartArea.AxisY.LabelStyle.Format = "#(万元)";
             chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64);
             chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64);
             chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);

SGGL/FineUIPro.Web/ErrLog.txt

@@ -322,3 +322,303 @@ IP地址:::1
 出错时间:05/17/2023 16:36:26
 出错时间:05/17/2023 16:36:26
 
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157
+出错时间:05/20/2023 12:47:17
+出错时间:05/20/2023 12:47:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022
+出错时间:05/20/2023 12:47:18
+出错时间:05/20/2023 12:47:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918
+出错时间:05/20/2023 12:47:18
+出错时间:05/20/2023 12:47:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860
+出错时间:05/20/2023 12:47:18
+出错时间:05/20/2023 12:47:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157
+出错时间:05/20/2023 14:47:17
+出错时间:05/20/2023 14:47:17
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022
+出错时间:05/20/2023 14:47:17
+出错时间:05/20/2023 14:47:17
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918
+出错时间:05/20/2023 14:47:17
+出错时间:05/20/2023 14:47:17
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860
+出错时间:05/20/2023 14:47:17
+出错时间:05/20/2023 14:47:17
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2157
+出错时间:05/22/2023 13:23:54
+出错时间:05/22/2023 13:23:54
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2022
+出错时间:05/22/2023 13:23:54
+出错时间:05/22/2023 13:23:54
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1918
+出错时间:05/22/2023 13:23:54
+出错时间:05/22/2023 13:23:54
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1860
+出错时间:05/22/2023 13:23:54
+出错时间:05/22/2023 13:23:54
+

SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx

@@ -22,7 +22,7 @@
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar1" Position="Top" ToolbarAlign="Right" runat="server">
                                     <Items>
-                                        <f:DatePicker runat="server" ID="txtMonths" Required="true" Label="月份" DateFormatString="yyyy-MM" LabelWidth="70px" LabelAlign="Right" Width="200px"
+                                        <f:DatePicker runat="server" ID="txtMonths" Required="true" Label="月份" DisplayType="Month" DateFormatString="yyyy-MM" LabelWidth="70px" LabelAlign="Right" Width="200px"
                                             ShowRedStar="true">
                                         </f:DatePicker>
                                         <f:Button ID="btnSearch" Text="查询" MarginLeft="40px" EnablePostBack="true" runat="server" Icon="SystemSearch"
@@ -72,7 +72,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
-                                        <f:GroupField HeaderText="赢得值参数" TextAlign="Center">
+                                        <f:GroupField HeaderText="赢得值参数(单位：万元)" TextAlign="Center">
                                             <Columns>
                                                 <f:RenderField Width="70px" ColumnID="BCWP" DataField="BCWP" FieldType="String"
                                                     HeaderText="BCWP" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
@@ -122,7 +122,7 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>--%>
-                                        <f:GroupField HeaderText="赢得值参数" TextAlign="Center">
+                                        <f:GroupField HeaderText="赢得值参数(单位：万元)" TextAlign="Center">
                                             <Columns>
                                                 <f:RenderField Width="70px" ColumnID="BCWP" DataField="BCWP" FieldType="String"
                                                     HeaderText="BCWP" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
@@ -162,23 +162,17 @@
                                 <f:Grid ID="Grid4" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="工程量清单设置" EnableCollapse="true"
                                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ForceFit="true"
                                     ClicksToEdit="1" DataIDField="Id" AllowSorting="true" SortField="Id"
-                                    SortDirection="ASC" EnableColumnLines="true"
+                                    SortDirection="ASC" EnableColumnLines="true" TreeColumn="Name" DataParentIDField="SupId" EnableTree="true"
                                     AllowPaging="false" IsDatabasePaging="false" PageSize="10000"
                                     AllowFilters="true" EnableTextSelection="True">
                                     <Columns>
-                                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                        <f:RenderField Width="60px" ColumnID="Id" DataField="Id" FieldType="String"
-                                            EnableLock="true" Locked="False">
+                                                    HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
-                                            <ItemTemplate>
-                                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid4.PageIndex * Grid4.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
-                                            </ItemTemplate>
-                                        </f:TemplateField>
-                                        <f:RenderField Width="100px" ColumnID="Name1" DataField="Name1" FieldType="String"
-                                                    HeaderText="专业" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
                                                 </f:RenderField>
-                                        <f:RenderField Width="130px" ColumnID="Name2" DataField="Name2" FieldType="String"
+                                        <f:RenderField Width="180px" ColumnID="Name" DataField="Name" FieldType="String"
-                                                    HeaderText="分部工程" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
+                                                    HeaderText="专业和分部工程" HeaderTextAlign="Center" TextAlign="Left" EnableColumnEdit="true">
                                                 </f:RenderField>
-                                        <f:GroupField HeaderText="本月赢得值参数" TextAlign="Center">
+                                        <f:GroupField HeaderText="本月赢得值参数(单位：万元)" TextAlign="Center">
                                             <Columns>
                                                 <f:RenderField Width="90px" ColumnID="mBCWP" DataField="mBCWP" FieldType="String"
                                                     HeaderText="BCWP" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">
@@ -208,7 +202,7 @@
                                                 </f:RenderField>
                                             </Columns>
                                         </f:GroupField>
-                                        <f:GroupField HeaderText="累计赢得值参数" TextAlign="Center">
+                                        <f:GroupField HeaderText="累计赢得值参数(单位：万元)" TextAlign="Center">
                                             <Columns>
                                                 <f:RenderField Width="90px" ColumnID="BCWP" DataField="BCWP" FieldType="String"
                                                     HeaderText="BCWP" HeaderTextAlign="Center" TextAlign="Center" EnableColumnEdit="true">

SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.cs

@@ -179,8 +179,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                 //按专业统计
                 DataTable table4 = new DataTable();
                 table4.Columns.Add(new DataColumn("Id", typeof(String)));
-                table4.Columns.Add(new DataColumn("Name1", typeof(String)));
+                table4.Columns.Add(new DataColumn("SupId", typeof(String)));
-                table4.Columns.Add(new DataColumn("Name2", typeof(String)));
+                table4.Columns.Add(new DataColumn("Name", typeof(String)));
                 table4.Columns.Add(new DataColumn("mBCWP", typeof(String)));
                 table4.Columns.Add(new DataColumn("mBCWS", typeof(String)));
                 table4.Columns.Add(new DataColumn("mACWP", typeof(String)));
@@ -206,6 +206,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                 DataRow row4;
                 decimal cnACWP, cnBCWP, cnBCWS, cnmACWP, cnmBCWP, cnmBCWS, cnCV, cnSV, cnCPI, cnSPI, cnmCV, cnmSV, cnmCPI, cnmSPI,
                     unACWP, unBCWP, unBCWS, unmACWP, unmBCWP, unmBCWS, unCV, unSV, unCPI, unSPI, unmCV, unmSV, unmCPI, unmSPI;
+                int a = 1, b = 1;
                 foreach (var cn in cnProfessionInits)
                 {
                     cnACWP = 0;
@@ -223,8 +224,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     cnmCPI = 0;
                     cnmSPI = 0;
                     row4 = table4.NewRow();
-                    row4[0] = SQLHelper.GetNewID();
+                    row4[0] = a;
-                    row4[1] = cn.CnProfessionName;
+                    row4[1] = "0";
+                    row4[2] = cn.CnProfessionName;
                     var cnDetails = (from x in details
                                      join y in cnProfessions on x.ParentId equals y.CnProfessionId
                                      where y.OldId == cn.CnProfessionId
@@ -270,6 +272,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     row4[15] = cnCPI.ToString("0.####");
                     row4[16] = cnSPI.ToString("0.####");
                     table4.Rows.Add(row4);
+                    b = 1;
                     var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList();
                     foreach (var un in unLists)
                     {
@@ -288,7 +291,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         unmCPI = 0;
                         unmSPI = 0;
                         row4 = table4.NewRow();
-                        row4[0] = SQLHelper.GetNewID();
+                        row4[0] = a.ToString() + "." + b.ToString();
+                        row4[1] = a;
                         row4[2] = un.UnitProjectName;
                         var unDetails = from x in details
                                         join y in unitProjects on x.ParentId equals y.UnitProjectId
@@ -335,7 +339,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         row4[15] = unCPI.ToString("0.####");
                         row4[16] = unSPI.ToString("0.####");
                         table4.Rows.Add(row4);
+                        b++;
                     }
+                    a++;
                 }
                 this.Grid4.DataSource = table4;
                 this.Grid4.DataBind();
@@ -503,14 +509,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     //builder.CellFormat.Width = 30;
                     //builder.Write("序号");
-                    //赢得值参数
+                    //赢得值参数(单位：万元)
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                     builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                     builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 240;
-                    builder.Write("赢得值参数");
+                    builder.Write("赢得值参数(单位：万元)");
                     //赢得值评价指标
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -662,14 +668,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     //builder.CellFormat.Width = 30;
                     //builder.Write("序号");
-                    //赢得值参数
+                    //赢得值参数(单位：万元)
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                     builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                     builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 240;
-                    builder.Write("赢得值参数");
+                    builder.Write("赢得值参数(单位：万元)");
                     //赢得值评价指标
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -829,14 +835,14 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 60;
                     builder.Write("分部工程");
-                    //本月赢得值参数
+                    //本月赢得值参数(单位：万元)
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                     builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                     builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 150;
-                    builder.Write("本月赢得值参数");
+                    builder.Write("本月赢得值参数(单位：万元)");
                     //本月赢得值评价指标
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -936,7 +942,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                                   select x;
                     decimal cnACWP, cnBCWP, cnBCWS, cnmACWP, cnmBCWP, cnmBCWS, cnCV, cnSV, cnCPI, cnSPI, cnmCV, cnmSV, cnmCPI, cnmSPI,
                         unACWP, unBCWP, unBCWS, unmACWP, unmBCWP, unmBCWS, unCV, unSV, unCPI, unSPI, unmCV, unmSV, unmCPI, unmSPI;
-                    int h = 1;
+                    int a = 1, b = 1;
                     foreach (var cn in cnProfessionInits)
                     {
                         cnmACWP = 0;
@@ -954,7 +960,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                         builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                         builder.CellFormat.Width = 30;
-                        builder.Write(h.ToString());
+                        builder.Write(a.ToString());
                         //专业
                         builder.InsertCell();
                         builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -1045,7 +1051,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         builder.CellFormat.Width = 50;
                         builder.Write(cnmSPI.ToString("0.####"));
                         builder.EndRow();
-                        h++;
+                        b = 1;
                         var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList();
                         foreach (var un in unLists)
                         {
@@ -1064,7 +1070,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                             builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                             builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                             builder.CellFormat.Width = 30;
-                            builder.Write(h.ToString());
+                            builder.Write(a.ToString() + "." + b.ToString());
                             //专业
                             builder.InsertCell();
                             builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -1155,8 +1161,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                             builder.CellFormat.Width = 50;
                             builder.Write(unmSPI.ToString("0.####"));
                             builder.EndRow();
-                            h++;
+                            b++;
                         }
+                        a++;
                     }
 
 
@@ -1192,7 +1199,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 60;
                     builder.Write("分部工程");
-                    //累计赢得值参数
+                    //累计赢得值参数(单位：万元)
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                     builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
@@ -1200,7 +1207,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     builder.CellFormat.VerticalMerge = CellMerge.None;
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                     builder.CellFormat.Width = 150;
-                    builder.Write("累计赢得值参数");
+                    builder.Write("累计赢得值参数(单位：万元)");
                     //累计赢得值评价指标
                     builder.InsertCell();
                     builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -1292,7 +1299,8 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                     builder.CellFormat.Width = 50;
                     builder.Write("SPI");
                     builder.EndRow();
-                    h = 1;
+                    a = 1;
+                    b = 1;
                     foreach (var cn in cnProfessionInits)
                     {
                         cnACWP = 0;
@@ -1309,7 +1317,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                         builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                         builder.CellFormat.Width = 30;
-                        builder.Write(h.ToString());
+                        builder.Write(a.ToString());
                         //专业
                         builder.InsertCell();
                         builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -1413,7 +1421,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                         builder.CellFormat.Width = 50;
                         builder.Write(cnSPI.ToString("0.####"));
                         builder.EndRow();
-                        h++;
+                        b = 1;
                         var unLists = (from x in unitProjectInits where x.CnProfessionId == cn.CnProfessionId orderby x.SortIndex select x).ToList();
                         foreach (var un in unLists)
                         {
@@ -1431,7 +1439,7 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                             builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                             builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                             builder.CellFormat.Width = 30;
-                            builder.Write(h.ToString());
+                            builder.Write(a.ToString() + "." + b.ToString());
                             //专业
                             builder.InsertCell();
                             builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
@@ -1522,8 +1530,9 @@ namespace FineUIPro.Web.JDGL.CostAnalysis
                             builder.CellFormat.Width = 50;
                             builder.Write(unSPI.ToString("0.####"));
                             builder.EndRow();
-                            h++;
+                            b++;
                         }
+                        a++;
                     }
                     #endregion
                     doc.Save(newUrl);

SGGL/FineUIPro.Web/JDGL/CostAnalysis/JDReport.aspx.designer.cs

@@ -192,15 +192,6 @@ namespace FineUIPro.Web.JDGL.CostAnalysis {
         /// </remarks>
         protected global::FineUIPro.Grid Grid4;
         
-        /// <summary>
-        /// lblPageIndex 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
         /// <summary>
         /// GroupPanel5 控件。
         /// </summary>