diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql
new file mode 100644
index 00000000..af75d37e
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-03-18-bwj.sql
@@ -0,0 +1,257 @@
+
+delete from Sys_Menu where MenuId='E4DD3689-0A72-43A5-8058-34C14D1FA4B0'
+delete from Sys_ButtonToMenu where MenuId='E4DD3689-0A72-43A5-8058-34C14D1FA4B0'
+go
+
+
+CREATE TABLE [dbo].[TestRun_MonthReport](
+	[MonthReportId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[MonthReportCode] [nvarchar](50) NULL,
+	[MonthReportDate] [datetime] NULL,
+	[ProjectOverview] [nvarchar](1000) NULL,
+	[ProjectBaseInfo] [nvarchar](2000) NULL,
+	[EngineeringPlant] [nvarchar](2000) NULL,
+	[ProjectContract] [nvarchar](2000) NULL,
+	[Milestone] [nvarchar](1000) NULL,
+	[CompleteWork] [nvarchar](1000) NULL,
+	[ProblemSituation] [nvarchar](1000) NULL,
+	[Budget] [decimal](18, 2) NULL,
+	[BudgetTotal] [decimal](18, 2) NULL,
+	[ActualCost] [decimal](18, 2) NULL,
+	[ActualCostTotal] [decimal](18, 2) NULL,
+	[PublicationStatus] [nvarchar](500) NULL,
+	[ImplementationStatus] [nvarchar](500) NULL,
+	[HSEManageSituation] [nvarchar](500) NULL,
+	[NextMonthMilestone] [nvarchar](1000) NULL,
+	[NextMonthCompleteWork] [nvarchar](1000) NULL,
+	[NextMonthSchedule] [nvarchar](1000) NULL,
+	[NextMonthDrivingCost] [nvarchar](1000) NULL,
+	[ProblemsMeasures] [nvarchar](2000) NULL,
+	[SolvedProblems] [nvarchar](2000) NULL,
+	[PushPerson] [nvarchar](1000) NULL,
+ CONSTRAINT [PK_TestRun_MonthReport] PRIMARY KEY CLUSTERED 
+(
+	[MonthReportId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReport]  WITH CHECK ADD  CONSTRAINT [FK_TestRun_MonthReport_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReport] CHECK CONSTRAINT [FK_TestRun_MonthReport_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�±�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @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'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportCode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'MonthReportDate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀ���ơ���Ŀ��ơ��û����ơ���Ŀ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectOverview'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀ�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectBaseInfo'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����װ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'EngineeringPlant'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ŀ��ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProjectContract'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿����ﵽ����Ҫ���Ƶ����̱���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'Milestone'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������ɵĿ�����Ҫ�/����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'CompleteWork'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���´�������Ľ������Լ���չ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProblemSituation'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿�������Ԥ��ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'Budget'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ۼƿ�������Ԥ��ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'BudgetTotal'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿�������ʵ��ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ActualCost'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ۼƿ�������ʵ��ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ActualCostTotal'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿����ڲ�������ⲿ����������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'PublicationStatus'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿����ڲ�������ⲿ���ʵʩ���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ImplementationStatus'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'HSE�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'HSEManageSituation'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¿���Ӧ�ﵽ����Ҫ���Ƶ����̱���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthMilestone'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����Ӧ��ɵĿ�����Ҫ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthCompleteWork'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����µĻ�׼���ȼƻ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthSchedule'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Ҫ�����ÿ�ƻ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'NextMonthDrivingCost'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����Ŀǰ���ڵ���Ҫ���⼰�Ľ���ʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'ProblemsMeasures'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��Ҫ��Ŀ��������Ŀ���ܡ���ز����Լ��û����������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'SolvedProblems'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���������Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport', @level2type=N'COLUMN',@level2name=N'PushPerson'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�����±����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReport'
+GO
+
+CREATE TABLE [dbo].[TestRun_MonthReportItem](
+	[MonthReportItemId] [nvarchar](50) NOT NULL,
+	[MonthReportId] [nvarchar](50) NULL,
+	[SortIndex] [nchar](10) NULL,
+	[WorkPackageType] [nvarchar](50) NULL,
+	[Unit] [nchar](10) NULL,
+	[DesignCount] [int] NULL,
+	[MonthPlan] [int] NULL,
+	[MonthActual] [nvarchar](50) NULL,
+	[TotalPlan] [int] NULL,
+	[TatalActual] [int] NULL,
+	[CompletionRate] [nvarchar](50) NULL,
+ CONSTRAINT [PK_TestRun_MonthReportItem] PRIMARY KEY CLUSTERED 
+(
+	[MonthReportItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReportItem]  WITH CHECK ADD  CONSTRAINT [FK_TestRun_MonthReportItem_TestRun_MonthReport] FOREIGN KEY([MonthReportId])
+REFERENCES [dbo].[TestRun_MonthReport] ([MonthReportId])
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReportItem] CHECK CONSTRAINT [FK_TestRun_MonthReportItem_TestRun_MonthReport]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthReportItemId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�±�Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'SortIndex'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'WorkPackageType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'Unit'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'DesignCount'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���¼ƻ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthPlan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ʵ�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'MonthActual'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ۼƼƻ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'TotalPlan'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ۼ�ʵ�����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'TatalActual'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem', @level2type=N'COLUMN',@level2name=N'CompletionRate'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������������ͳ�Ʊ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem'
+GO
+
+
+
+
+CREATE TABLE [dbo].[TestRun_MonthReportItem2](
+	[MonthReportItem2Id] [nvarchar](50) NOT NULL,
+	[MonthReportId] [nvarchar](50) NULL,
+	[ReportType] [nvarchar](50) NULL,
+	[TypeName] [nvarchar](50) NULL,
+	[PV] [nvarchar](50) NULL,
+	[EV] [nvarchar](50) NULL,
+	[AC] [nvarchar](50) NULL,
+	[CV] [nvarchar](50) NULL,
+	[SV] [nvarchar](50) NULL,
+	[CPI] [nvarchar](50) NULL,
+	[SPI] [nvarchar](50) NULL,
+	[SortIndex] [int] NULL,
+ CONSTRAINT [PK_MonthReportItem2] PRIMARY KEY CLUSTERED 
+(
+	[MonthReportItem2Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReportItem2]  WITH CHECK ADD  CONSTRAINT [FK_TestRun_MonthReportItem2_TestRun_MonthReport] FOREIGN KEY([MonthReportId])
+REFERENCES [dbo].[TestRun_MonthReport] ([MonthReportId])
+GO
+
+ALTER TABLE [dbo].[TestRun_MonthReportItem2] CHECK CONSTRAINT [FK_TestRun_MonthReportItem2_TestRun_MonthReport]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'MonthReportItem2Id'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�±�id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'MonthReportId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�������ͣ�1-���£�2-�ۼƣ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'ReportType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'��������' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'TypeName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ƻ�ֵPV��Ҳ��Ϊ�ƻ�����Ԥ��ɱ�BCWS��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'PV'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ӯ��ֵEV(Ҳ��Ϊ��ֵ������ɹ�����Ԥ��ɱ�BCWP)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'EV'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵ�ʳɱ�AC(Ҳ��Ϊ����ɹ�����ʵ�ʳɱ�ACWP)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'AC'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ɱ�ƫ��(CV=EV-AC)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'CV'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'����ƫ��SV (SV=EV-PV)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'SV'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ɱ���Чָ��CPI (CPI=EV/AC)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'CPI'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'���ȼ�Чָ�� SPI (SPI = EV/PV)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2', @level2type=N'COLUMN',@level2name=N'SPI'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Ч�������ݱ�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'TestRun_MonthReportItem2'
+GO
+
+
+
+
+
+
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql
new file mode 100644
index 00000000..dd699a98
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-03-18-phf.sql
@@ -0,0 +1,90 @@
+CREATE TABLE [dbo].[Inspection_Test_Plan](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[CNProfessionalId] [nvarchar](50) NULL,
+	[PlanCode] [nvarchar](50) NULL,
+	[PlanName] [nvarchar](50) NULL,
+	[ApprovalDate] [datetime] NULL,
+	[AuditMan] [nvarchar](50) NULL,
+	[ApprovalMan] [nvarchar](50) NULL,
+	[Remarks] [nvarchar](50) NULL,
+	[CreateMan] [nvarchar](50) NULL,
+	[CreateDate] [datetime] NULL,
+ CONSTRAINT [PK_Inspection_Test_Plan] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+CREATE TABLE [dbo].[Report_Construction_Plan](
+	[Id] [nvarchar](50) NOT NULL,
+	[ReportId] [nvarchar](50) NULL,
+	ReType nvarchar(20) NULL,
+	[UnitOrMajor] [nvarchar](200) NULL,
+	[Quantity1] [int] NULL,
+	[Quantity2] [int] NULL,
+	[Quantity3] [int] NULL,
+	[Remarks] [nvarchar](200) NULL,
+ CONSTRAINT [PK_Report_Construction_Plan] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('A70EA41D-0B45-4753-AC77-BF28DA066402','��������ƻ�����','CQMS/Comprehensive/InspectionTestPlan.aspx',76,'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1)
+go
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('0D2A8A6E-C04F-4701-9FAF-ADA6788249E0','A70EA41D-0B45-4753-AC77-BF28DA066402','����',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('FA0CADFD-9A24-4443-A769-F817F6237BA0','A70EA41D-0B45-4753-AC77-BF28DA066402','�޸�',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('99AD6093-6E22-4AA0-A836-95E54ECCA87E','A70EA41D-0B45-4753-AC77-BF28DA066402','ɾ��',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('4F627543-A7DD-462A-94C0-520AD0024A8E','A70EA41D-0B45-4753-AC77-BF28DA066402','����',4)
+go
+
+--����һ����ģ��Σ��ʩ���������� ר��������Ա
+ALTER TABLE Comprehensive_MajorPlanApproval
+add ExpertReviewMan NVARCHAR(200) NULL;
+
+--ͼֽ�����¼
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('856D53B3-C5FB-443F-917B-39E83BE685DB','ͼֽ�������','CQMS/Comprehensive/ReviewDrawings.aspx',111,
+'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1)
+go
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('A8BDAFCC-1AAF-45DC-88C3-D526688A9818','856D53B3-C5FB-443F-917B-39E83BE685DB','����',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('546B393D-3C81-4A1F-9290-15C64B5459D6','856D53B3-C5FB-443F-917B-39E83BE685DB','�޸�',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('EB3AB16E-CD99-47CF-884F-3647EB0860AD','856D53B3-C5FB-443F-917B-39E83BE685DB','ɾ��',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('4050BDBD-AA20-4D38-813A-6DA4FFD528D5','856D53B3-C5FB-443F-917B-39E83BE685DB','����',4)
+go
+
+--����ͼֽ���������
+CREATE TABLE [dbo].[Comprehensive_ReviewDrawings](
+	[Id] [nvarchar](50) NOT NULL,
+	ProjectId nvarchar(50) not null,
+	DraCode nvarchar(50) not null,
+	[CNProfessionalId] [nvarchar](50) NULL,
+	[ReviewDate] [datetime] NULL,
+	[UnitWorkId] [nvarchar](500) NULL,
+	[ReceiveUnits] [nvarchar](800) NULL,
+	[Status] [nvarchar](2) NULL,
+	[Remarks] [nvarchar](500) NULL,
+	[CreateMan] [nvarchar](50) NULL,
+	[CreateDate] [datetime] NULL,
+ CONSTRAINT [PK_Comprehensive_ReviewDrawings] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql
new file mode 100644
index 00000000..bc880423
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-03-19-phf.sql
@@ -0,0 +1,48 @@
+--�޸����������
+update sys_menu set IsUsed=0 where menuid='ec1d25f6-fc6d-4b76-877d-d545669b21c9'
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','���������','CQMS/ProcessControl/NondestructiveTest_New.aspx',25,'149f1f1c-a925-412b-970e-e9b79d54e03f','Menu_CQMS',0,1,1)
+go
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('BC7C9DE9-24C2-4FA7-B03B-4B47C2E49627','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','����',1)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('51C295E7-2129-448D-92C9-D095E96869A8','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','�޸�',2)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('0047CA81-925C-4D1B-B8DC-5484AB35859D','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','ɾ��',3)
+insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+values('7F728497-368C-46FB-B67A-B7A3233C98D0','9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88','����',4)
+go
+
+--�µ������������
+CREATE TABLE [dbo].[ProcessControl_NondestructiveTest_New](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitId] [nvarchar](50) NULL,
+	[ProfessionalName] [nvarchar](50) NULL,
+	[MonthQuantity] [int] NULL,
+	[TotalQuantity] [int] NULL,
+	[MonthRate] [nvarchar](50) NULL,
+	[TotalRate] [nvarchar](50) NULL,
+	[CreateDate] [datetime] NULL,
+	[CreateMan] [nvarchar](50) NULL,
+ CONSTRAINT [PK_ProcessControl_NondestructiveTest_New] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'ProfessionalName'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'������Ƭ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'MonthQuantity'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ۼ���Ƭ����' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ProcessControl_NondestructiveTest_New', @level2type=N'COLUMN',@level2name=N'TotalQuantity'
+GO
+
+--���Ӻϸ����ֶ�
+ALTER TABLE Report_Construction_Plan
+ADD QuaRate nvarchar(50) NULL;
\ No newline at end of file
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 19f431f1..91cf52e0 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -207,6 +207,7 @@
     <Compile Include="CQMS\Comprehensive\InspectionMachineService.cs" />
     <Compile Include="CQMS\Comprehensive\InspectionPersonApproveService.cs" />
     <Compile Include="CQMS\Comprehensive\InspectionPersonService.cs" />
+    <Compile Include="CQMS\Comprehensive\InspectionTestPlanService.cs" />
     <Compile Include="CQMS\Comprehensive\MajorPlanApprovalItemService.cs" />
     <Compile Include="CQMS\Comprehensive\MajorPlanApprovalService.cs" />
     <Compile Include="CQMS\Comprehensive\NCRManagementApproveService.cs" />
@@ -217,6 +218,7 @@
     <Compile Include="CQMS\Comprehensive\PressurePipeService.cs" />
     <Compile Include="CQMS\Comprehensive\QualityAccidentApproveService.cs" />
     <Compile Include="CQMS\Comprehensive\QualityAccidentService.cs" />
+    <Compile Include="CQMS\Comprehensive\ReviewDrawingsService.cs" />
     <Compile Include="CQMS\Comprehensive\SiteVisaManagementApproveService.cs" />
     <Compile Include="CQMS\Comprehensive\SiteVisaManagementService.cs" />
     <Compile Include="CQMS\Comprehensive\SpecialEquipmentApproveService.cs" />
@@ -257,6 +259,7 @@
     <Compile Include="CQMS\ManageReport\NextQualityControlService.cs" />
     <Compile Include="CQMS\ManageReport\ProjectQualityWorkSummaryReportService.cs" />
     <Compile Include="CQMS\ManageReport\ProjectQuarterlyProjectQualityService.cs" />
+    <Compile Include="CQMS\ManageReport\ReportNew\ConstructionPlanService.cs" />
     <Compile Include="CQMS\ManageReport\ReportNew\CqmsTargetService.cs" />
     <Compile Include="CQMS\ManageReport\ReportNew\TextBoxContentService.cs" />
     <Compile Include="CQMS\ManageReport\ReportNew\WeekAndMonthReportNewService.cs" />
@@ -267,6 +270,7 @@
     <Compile Include="CQMS\ProcessControl\HotProessManageService.cs" />
     <Compile Include="CQMS\ProcessControl\InspectionManagementDetailService.cs" />
     <Compile Include="CQMS\ProcessControl\InspectionManagementService.cs" />
+    <Compile Include="CQMS\ProcessControl\NondestructiveTestNewService.cs" />
     <Compile Include="CQMS\ProcessControl\NondestructiveTestService.cs" />
     <Compile Include="CQMS\ProcessControl\TestPackageManagementService.cs" />
     <Compile Include="CQMS\Solution\CQMSConstructSolutionApproveService.cs" />
@@ -750,6 +754,9 @@
     <Compile Include="TestRun\DriverPrepare\DriverPrepareSchemePlanService.cs" />
     <Compile Include="TestRun\DriverProgressService.cs" />
     <Compile Include="TestRun\DriverReport\DriverReportService.cs" />
+    <Compile Include="TestRun\DriverReport\TestRun_MonthReportItem2Service.cs" />
+    <Compile Include="TestRun\DriverReport\TestRun_MonthReportItemService.cs" />
+    <Compile Include="TestRun\DriverReport\TestRun_MonthReportService.cs" />
     <Compile Include="TestRun\DriverRun\DriverRunApproveService.cs" />
     <Compile Include="TestRun\DriverRun\DriverRunContactService.cs" />
     <Compile Include="TestRun\DriverRun\DriverRunPlanService.cs" />
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs
new file mode 100644
index 00000000..85df874f
--- /dev/null
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionTestPlanService.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 检验试验计划管理
+    /// </summary>
+    public class InspectionTestPlanService
+    {
+        public static bool Insert(Model.Inspection_Test_Plan model)
+        {
+            try
+            {
+                Funs.DB.Inspection_Test_Plan.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.Inspection_Test_Plan model)
+        {
+            try
+            {
+                var result = Funs.DB.Inspection_Test_Plan.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.UnitId = model.UnitId;
+                    result.CNProfessionalId = model.CNProfessionalId;
+                    result.PlanCode = model.PlanCode;
+                    result.PlanName = model.PlanName;
+                    result.ApprovalDate = model.ApprovalDate;
+                    result.AuditMan = model.AuditMan;
+                    result.ApprovalMan = model.ApprovalMan;
+                    result.Remarks = model.Remarks;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.Inspection_Test_Plan.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Inspection_Test_Plan.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.Inspection_Test_Plan.Where(a => a.Id == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Inspection_Test_Plan.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.Inspection_Test_Plan Detail(string newId)
+        {
+            var result = Funs.DB.Inspection_Test_Plan.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+    }
+}
diff --git a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
index 95c6f940..0e46e050 100644
--- a/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
@@ -118,6 +118,7 @@ namespace BLL
             newMajorPlanApproval.CompileMan = majorPlanApproval.CompileMan;
             newMajorPlanApproval.CompileDate = majorPlanApproval.CompileDate;
             newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
+            newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
             db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
             db.SubmitChanges();
         }
@@ -144,6 +145,7 @@ namespace BLL
                 newMajorPlanApproval.ImplementationDeviation = majorPlanApproval.ImplementationDeviation;
                 newMajorPlanApproval.AttachUrl = majorPlanApproval.AttachUrl;
                 newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
+                newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
                 db.SubmitChanges();
             }
         }
diff --git a/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs b/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs
new file mode 100644
index 00000000..33213111
--- /dev/null
+++ b/SGGL/BLL/CQMS/Comprehensive/ReviewDrawingsService.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace BLL
+{
+    public class ReviewDrawingsService
+    {
+        public static bool Insert(Model.Comprehensive_ReviewDrawings model)
+        {
+            try
+            {
+                Funs.DB.Comprehensive_ReviewDrawings.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.Comprehensive_ReviewDrawings model)
+        {
+            try
+            {
+                var result = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.CNProfessionalId = model.CNProfessionalId;
+                    result.DraCode = model.DraCode;
+                    result.ReviewDate = model.ReviewDate;
+                    result.UnitWorkId = model.UnitWorkId;
+                    result.ReceiveUnits = model.ReceiveUnits;
+                    result.Status = model.Status;
+                    result.Remarks = model.Remarks;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.Comprehensive_ReviewDrawings.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Comprehensive_ReviewDrawings.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.Comprehensive_ReviewDrawings.Where(a => a.Id == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Comprehensive_ReviewDrawings.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.Comprehensive_ReviewDrawings Detail(string newId)
+        {
+            var result = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+    }
+}
diff --git a/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs
new file mode 100644
index 00000000..48a573b3
--- /dev/null
+++ b/SGGL/BLL/CQMS/ManageReport/ReportNew/ConstructionPlanService.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL.CQMS.ManageReport.ReportNew
+{
+    /// <summary>
+    /// 质量施工月报施工方案及检验试验计划审批情况
+    /// </summary>
+    public class ConstructionPlanService
+    {
+        public static bool Insert(Model.Report_Construction_Plan model)
+        {
+            try
+            {
+                Funs.DB.Report_Construction_Plan.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.Report_Construction_Plan model)
+        {
+            try
+            {
+                var result = Funs.DB.Report_Construction_Plan.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.Remarks = model.Remarks;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.Report_Construction_Plan.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.Report_Construction_Plan.Where(a => a.ReportId == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.Report_Construction_Plan.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.Report_Construction_Plan Detail(string newId)
+        {
+            var result = Funs.DB.Report_Construction_Plan.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+    }
+}
diff --git a/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs
new file mode 100644
index 00000000..f099fb2a
--- /dev/null
+++ b/SGGL/BLL/CQMS/ProcessControl/NondestructiveTestNewService.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace BLL
+{
+    public class NondestructiveTestNewService
+    {
+        public static bool Insert(Model.ProcessControl_NondestructiveTest_New model)
+        {
+            try
+            {
+                Funs.DB.ProcessControl_NondestructiveTest_New.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"插入数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Update(Model.ProcessControl_NondestructiveTest_New model)
+        {
+            try
+            {
+                var result = Funs.DB.ProcessControl_NondestructiveTest_New.FirstOrDefault(a => a.Id == model.Id);
+                if (result != null)
+                {
+                    result.UnitId = model.UnitId;
+                    result.ProfessionalName = model.ProfessionalName;
+                    result.MonthQuantity = model.MonthQuantity;
+                    result.TotalQuantity = model.TotalQuantity;
+                    result.MonthRate = model.MonthRate;
+                    result.TotalRate = model.TotalRate;
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"更新表数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(List<string> newId)
+        {
+            try
+            {
+                var result = Funs.DB.ProcessControl_NondestructiveTest_New.Where(a => newId.Contains(a.Id)).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.ProcessControl_NondestructiveTest_New.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static bool Delete(string newId)
+        {
+            try
+            {
+                var result = Funs.DB.ProcessControl_NondestructiveTest_New.Where(a => a.Id == newId).ToList();
+                if (result.Count > 0)
+                {
+                    Funs.DB.ProcessControl_NondestructiveTest_New.DeleteAllOnSubmit(result);
+                    Funs.DB.SubmitChanges();
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog($"删除数据失败,原因：{ex.Message}");
+                return false;
+            }
+        }
+
+        public static Model.ProcessControl_NondestructiveTest_New Detail(string newId)
+        {
+            var result = Funs.DB.ProcessControl_NondestructiveTest_New.FirstOrDefault(a => a.Id == newId);
+            return result;
+        }
+    }
+}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 25c7f405..162cf96f 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3691,6 +3691,10 @@ namespace BLL
         /// </summary>
         public const string ProjectControlPointMenuId = "5AA08233-9E04-4808-AC43-DD411C5F9D31";
 
+        /// <summary>
+        /// 无损检测管理（新）
+        /// </summary>
+        public const string NondestructiveTestNewMenuId = "9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88";
         #region 国外项目
         #region 资料库
         /// <summary>
@@ -3781,6 +3785,11 @@ namespace BLL
         /// </summary>
         public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3";
 
+        /// <summary>
+        /// 检验试验计划管理
+        /// </summary>
+        public const string Inspection_Test_PlanMenuId = "A70EA41D-0B45-4753-AC77-BF28DA066402";
+
         /// <summary>
         /// NCR管理
         /// </summary>
@@ -3816,6 +3825,11 @@ namespace BLL
         /// </summary>
         public const string DesignDrawingsMenuId = "d8de4143-b680-44cf-9a78-acd3d49a8d00";
 
+        /// <summary>
+        /// 图纸会审管理
+        /// </summary>
+        public const string ReviewDrawingsMenuId = "856D53B3-C5FB-443F-917B-39E83BE685DB";
+
         /// <summary>
         /// 工序质量控制点维护
         /// </summary>
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 647c8449..4e193bbb 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -777,5 +777,18 @@ namespace BLL
             }
             return name;
         }
+
+        //获取下拉单位，value和text都是中文
+        public static void InitUnitDownListByText(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            dropName.DataValueField = "Text";
+            dropName.DataTextField = "Text";
+            dropName.DataSource = drpMainOrSubUnitList(projectId);
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
     }
 }
diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs
new file mode 100644
index 00000000..2fef4e56
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItem2Service.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    /// <summary>
+    /// 开车绩效测量数据
+    /// </summary>
+    public class TestRun_MonthReportItem2Service
+    {
+        /// <summary>
+        /// 根据月报告id获取开车绩效测量数据
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        /// <returns></returns>
+        public static List<Model.TestRun_MonthReportItem2> GetMonthReportItem2ByReportId(string monthReportId, string reportType)
+        {
+            return (from x in Funs.DB.TestRun_MonthReportItem2 where x.MonthReportId == monthReportId && x.ReportType == reportType orderby x.SortIndex select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加开车绩效测量数据
+        /// </summary>
+        /// <param name="item"></param>
+        public static void AddMonthReportItem2(Model.TestRun_MonthReportItem2 item)
+        {
+            Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2
+            {
+                MonthReportItem2Id = item.MonthReportItem2Id,
+                MonthReportId = item.MonthReportId,
+                ReportType = item.ReportType,
+                TypeName = item.TypeName,
+                PV = item.PV,
+                EV = item.EV,
+                AC = item.AC,
+                CV = item.CV,
+                SV = item.SV,
+                CPI = item.CPI,
+                SPI = item.SPI,
+                SortIndex=item.SortIndex,
+            };
+            Funs.DB.TestRun_MonthReportItem2.InsertOnSubmit(newItem);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据月报告id删除开车绩效测量数据
+        /// </summary>
+        /// <param name="reportId"></param>
+        public static void DeleteMonthReportItem2ByReportId(string reportId)
+        {
+            var q = (from x in Funs.DB.TestRun_MonthReportItem2 where x.MonthReportId == reportId select x).ToList();
+            if (q.Count > 0)
+            {
+                Funs.DB.TestRun_MonthReportItem2.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs
new file mode 100644
index 00000000..a1ecfc78
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportItemService.cs
@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 工作包完成情况统计
+    /// </summary>
+    public class TestRun_MonthReportItemService
+    {
+        /// <summary>
+        /// 根据月报id获取工作包完成情况
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        /// <returns></returns>
+        public static List<Model.TestRun_MonthReportItem> GetMonthReportItemByReportId(string monthReportId)
+        {
+            return (from x in Funs.DB.TestRun_MonthReportItem where x.MonthReportId == monthReportId orderby x.SortIndex select x).ToList();
+        }
+
+        /// <summary>
+        /// 添加工作包完成情况
+        /// </summary>
+        /// <param name="item"></param>
+        public static void AddMonthReportItem(Model.TestRun_MonthReportItem item)
+        {
+            Model.TestRun_MonthReportItem newItem = new Model.TestRun_MonthReportItem
+            {
+                MonthReportItemId = item.MonthReportItemId,
+                MonthReportId = item.MonthReportId,
+                SortIndex = item.SortIndex,
+                WorkPackageType = item.WorkPackageType,
+                Unit = item.Unit,
+                DesignCount = item.DesignCount,
+                MonthPlan = item.MonthPlan,
+                MonthActual = item.MonthActual,
+                TotalPlan = item.TotalPlan,
+                TatalActual = item.TatalActual,
+                CompletionRate = item.CompletionRate
+            };
+            Funs.DB.TestRun_MonthReportItem.InsertOnSubmit(newItem);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据月报告id删除工作包完成情况
+        /// </summary>
+        /// <param name="reportItemId"></param>
+        public static void DeleteMonthReportItemByMonthReportId(string monthReportId)
+        {
+            var q = (from x in Funs.DB.TestRun_MonthReportItem where x.MonthReportId == monthReportId select x).ToList();
+            if (q.Count > 0)
+            {
+                Funs.DB.TestRun_MonthReportItem.DeleteAllOnSubmit(q);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs
new file mode 100644
index 00000000..d4a6386f
--- /dev/null
+++ b/SGGL/BLL/TestRun/DriverReport/TestRun_MonthReportService.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Linq;
+
+namespace BLL
+{
+    /// <summary>
+    /// 开车月报告
+    /// </summary>
+    public class TestRun_MonthReportService
+    {
+        /// <summary>
+        /// 根据主键获取开车月报告
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        /// <returns></returns>
+        public static Model.TestRun_MonthReport GetMonthReportById(string monthReportId)
+        {
+            return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId);
+        }
+
+        /// <summary>
+        /// 根据月份获取开车月报告
+        /// </summary>
+        /// <param name="month"></param>
+        /// <returns></returns>
+        public static Model.TestRun_MonthReport GetMonthReportByMonth(string month)
+        {
+            return Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportDate == Convert.ToDateTime(month));
+        }
+
+        /// <summary>
+        /// 添加开车月报告
+        /// </summary>
+        /// <param name="monthReport"></param>
+        public static void AddMonthReport(Model.TestRun_MonthReport monthReport)
+        {
+            Model.TestRun_MonthReport newMonthReport = new Model.TestRun_MonthReport
+            {
+                MonthReportId = monthReport.MonthReportId,
+                ProjectId = monthReport.ProjectId,
+                MonthReportCode = monthReport.MonthReportCode,
+                MonthReportDate = monthReport.MonthReportDate,
+                ProjectOverview = monthReport.ProjectOverview,
+                ProjectBaseInfo = monthReport.ProjectBaseInfo,
+                EngineeringPlant = monthReport.EngineeringPlant,
+                ProjectContract = monthReport.ProjectContract,
+                Milestone = monthReport.Milestone,
+                CompleteWork = monthReport.CompleteWork,
+                ProblemSituation = monthReport.ProblemSituation,
+                Budget = monthReport.Budget,
+                BudgetTotal = monthReport.BudgetTotal,
+                ActualCost = monthReport.ActualCost,
+                ActualCostTotal = monthReport.ActualCostTotal,
+                PublicationStatus = monthReport.PublicationStatus,
+                ImplementationStatus = monthReport.ImplementationStatus,
+                HSEManageSituation = monthReport.HSEManageSituation,
+                NextMonthMilestone = monthReport.NextMonthMilestone,
+                NextMonthCompleteWork = monthReport.NextMonthCompleteWork,
+                NextMonthSchedule = monthReport.NextMonthSchedule,
+                NextMonthDrivingCost = monthReport.NextMonthDrivingCost,
+                ProblemsMeasures = monthReport.ProblemsMeasures,
+                SolvedProblems = monthReport.SolvedProblems,
+            };
+            Funs.DB.TestRun_MonthReport.InsertOnSubmit(newMonthReport);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改开车月报告
+        /// </summary>
+        /// <param name="monthReport"></param>
+        public static void UpdateMonthReport(Model.TestRun_MonthReport monthReport)
+        {
+            Model.TestRun_MonthReport newMonthReport = Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReport.MonthReportId);
+            if (newMonthReport != null)
+            {
+                newMonthReport.MonthReportCode = monthReport.MonthReportCode;
+                newMonthReport.MonthReportDate = monthReport.MonthReportDate;
+                newMonthReport.ProjectOverview = monthReport.ProjectOverview;
+                newMonthReport.ProjectBaseInfo = monthReport.ProjectBaseInfo;
+                newMonthReport.EngineeringPlant = monthReport.EngineeringPlant;
+                newMonthReport.ProjectContract = monthReport.ProjectContract;
+                newMonthReport.Milestone = monthReport.Milestone;
+                newMonthReport.CompleteWork = monthReport.CompleteWork;
+                newMonthReport.ProblemSituation = monthReport.ProblemSituation;
+                newMonthReport.Budget = monthReport.Budget;
+                newMonthReport.BudgetTotal = monthReport.BudgetTotal;
+                newMonthReport.ActualCost = monthReport.ActualCost;
+                newMonthReport.ActualCostTotal = monthReport.ActualCostTotal;
+                newMonthReport.PublicationStatus = monthReport.PublicationStatus;
+                newMonthReport.ImplementationStatus = monthReport.ImplementationStatus;
+                newMonthReport.HSEManageSituation = monthReport.HSEManageSituation;
+                newMonthReport.NextMonthMilestone = monthReport.NextMonthMilestone;
+                newMonthReport.NextMonthCompleteWork = monthReport.NextMonthCompleteWork;
+                newMonthReport.NextMonthSchedule = monthReport.NextMonthSchedule;
+                newMonthReport.NextMonthDrivingCost = monthReport.NextMonthDrivingCost;
+                newMonthReport.ProblemsMeasures = monthReport.ProblemsMeasures;
+                newMonthReport.SolvedProblems = monthReport.SolvedProblems;
+                Funs.DB.SubmitChanges();
+            }
+        }
+        
+        /// <summary>
+        /// 根据主键删除开车月报告
+        /// </summary>
+        /// <param name="monthReportId"></param>
+        public static void DeleteMonthReportById(string monthReportId)
+        {
+            Model.TestRun_MonthReport newMonthReport = Funs.DB.TestRun_MonthReport.FirstOrDefault(e => e.MonthReportId == monthReportId);
+            if (newMonthReport != null)
+            {
+                Funs.DB.TestRun_MonthReport.DeleteOnSubmit(newMonthReport);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
new file mode 100644
index 00000000..9792a0bd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx
@@ -0,0 +1,120 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionTestPlan.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>检验试验计划</title>
+
+</head>
+<body>
+    <form id="form1" runat="server">
+       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检验试验计划" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PlanCode"
+                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="sdrpUnitId" runat="server" Label="报批单位" LabelAlign="Right">
+                                </f:DropDownList>
+                                <f:DropDownList ID="drpCNPr" runat="server" Label="专业" LabelAlign="Right" LabelWidth="60px"></f:DropDownList>
+                                <f:TextBox runat="server" ID="txtPlanName" Label="计划名称" LabelAlign="Right"></f:TextBox>
+                                <f:Button ID="btnSearch" Icon="SystemSearch"
+                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="新增" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="报批单位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="200px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="150px">
+                        </f:RenderField>
+                       
+                        <f:RenderField ColumnID="PlanCode" DataField="PlanCode" FieldType="String" HeaderText="编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="150px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="PlanName" DataField="PlanName" FieldType="String" HeaderText="检验试验计划名称" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="180px">
+                        </f:RenderField>
+                         <f:RenderField ColumnID="ApprovalDate" DataField="ApprovalDate" FieldType="Date" Renderer="Date" HeaderText="审批日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="AuditMan" DataField="AuditMan" FieldType="String" HeaderText="审核人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                       
+                       
+                        <f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="审批人" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="Remarks" DataField="Remarks" FieldType="String" HeaderText="方案实施偏差" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="220px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("Id")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="检验试验计划" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="460px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs
new file mode 100644
index 00000000..d106e26f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.cs
@@ -0,0 +1,227 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class InspectionTestPlan : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true);
+                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNPr, true);
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select C.*,CN.ProfessionalName,C.CNProfessionalId,C.UnitId,u.UnitName 
+                              from Inspection_Test_Plan C 
+                              left join Base_CNProfessional CN on C.CNProfessionalId=CN.CNProfessionalId 
+							  left join Base_Unit as u on u.UnitId = C.UnitId
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (sdrpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND C.UnitId=@UnitId";
+                listStr.Add(new SqlParameter("@UnitId", sdrpUnitId.SelectedValue));
+            }
+            if (drpCNPr.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND C.CNProfessionalId=@CNProfessionalId";
+                listStr.Add(new SqlParameter("@CNProfessionalId", drpCNPr.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtPlanName.Text.Trim()))
+            {
+                strSql += " AND C.PlanName like @PlanName";
+                listStr.Add(new SqlParameter("@PlanName", "%" + txtPlanName.Text.Trim() + "%"));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == BLL.Const._Null)
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Inspection_Test_PlanMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuModify.Hidden = false;
+                    this.Grid1.EnableRowDoubleClickEvent = true;
+                }
+                else
+                {
+                    this.Grid1.EnableRowDoubleClickEvent = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 增加
+        /// <summary>
+        /// 新增按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionTestPlanEdit.aspx", "编辑 - ")));
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionTestPlanEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            btnMenuModify_Click(sender, e);
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var InspectionPerson = BLL.InspectionTestPlanService.Detail(rowID);
+                    if (InspectionPerson != null)
+                    {
+                        BLL.InspectionTestPlanService.Delete(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+       
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs
new file mode 100644
index 00000000..67589076
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlan.aspx.designer.cs
@@ -0,0 +1,179 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class InspectionTestPlan
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+
+        /// <summary>
+        /// sdrpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList sdrpUnitId;
+
+        /// <summary>
+        /// drpCNPr 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCNPr;
+
+        /// <summary>
+        /// txtPlanName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPlanName;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx
new file mode 100644
index 00000000..4e550250
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx
@@ -0,0 +1,82 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionTestPlanEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlanEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpUnitId" runat="server" Label="报批单位" Required="true" ShowRedStar="true" LabelWidth="130px" LabelAlign="right">
+                        </f:DropDownList>
+                        <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelWidth="130px" LabelAlign="right"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                       
+                        <f:TextBox ID="txtPlanCode" runat="server" Label="编号" MaxLength="50" Required="true" ShowRedStar="true" LabelWidth="130px" LabelAlign="right"></f:TextBox>
+                        <f:TextBox ID="txtPlanName" runat="server" Label="检验试验计划名称" LabelWidth="130px" LabelAlign="right"></f:TextBox>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                         <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="审批日期" ID="txtApprovalDate"
+                            LabelAlign="right" LabelWidth="130px">
+                        </f:DatePicker>
+                        
+                         <f:TextBox ID="txtAuditMan" runat="server" Label="审核人" MaxLength="50" LabelWidth="130px" LabelAlign="right"></f:TextBox>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                         <f:TextBox ID="txtApprovalMan" runat="server" Label="审批人" MaxLength="50" LabelWidth="130px" LabelAlign="right"></f:TextBox>
+                         <f:Label ID="Label13" runat="server"></f:Label>
+                    </Items>
+                </f:FormRow>
+              
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemarks" runat="server" Label="方案实施偏差" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label1" runat="server" Label="上传附件"
+                                    LabelAlign="Right" LabelWidth="130px">
+                                </f:Label>
+                                <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存"  ValidateForms="SimpleForm1" OnClick="btnSave_Click">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs
new file mode 100644
index 00000000..956c07f0
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.cs
@@ -0,0 +1,177 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class InspectionTestPlanEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+               
+                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+                BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
+                this.Id = Request.Params["Id"];
+                var model = BLL.InspectionTestPlanService.Detail(this.Id);
+                if (model != null)
+                {
+                   
+                    this.hdAttachUrl.Text = this.Id;
+                    if (!string.IsNullOrEmpty(model.UnitId))
+                    {
+                        this.drpUnitId.SelectedValue = model.UnitId;
+                    }
+                    if (!string.IsNullOrEmpty(model.CNProfessionalId))
+                    {
+                        this.drpCNProfessionalId.SelectedValue = model.CNProfessionalId;
+                    }
+                    this.txtPlanCode.Text = model.PlanCode;
+                    this.txtPlanName.Text = model.PlanName;
+                  
+                    if (model.ApprovalDate != null)
+                    {
+                        this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", model.ApprovalDate);
+                    }
+                    this.txtAuditMan.Text = model.AuditMan;
+                    this.txtApprovalMan.Text = model.ApprovalMan;
+                    this.txtRemarks.Text = model.Remarks;
+                }
+                else
+                {
+                    this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                }
+            }
+        }
+        #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttach_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdAttachUrl.Text))   //新增记录
+            {
+                this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/InsTestPlan&menuId={1}", this.hdAttachUrl.Text, BLL.Const.Inspection_Test_PlanMenuId)));
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (drpUnitId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择报批单位！", MessageBoxIcon.Warning);
+                return;
+            }
+            if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
+                return;
+            }
+            var majorPlanApproval = new Model.Inspection_Test_Plan();
+            majorPlanApproval.ProjectId = this.CurrUser.LoginProjectId;
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                majorPlanApproval.UnitId = this.drpUnitId.SelectedValue;
+            }
+            if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
+            {
+                majorPlanApproval.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
+            }
+            majorPlanApproval.PlanCode = this.txtPlanCode.Text.Trim();
+            majorPlanApproval.PlanName = this.txtPlanName.Text.Trim();
+          
+            if (!string.IsNullOrEmpty(this.txtApprovalDate.Text))
+            {
+                majorPlanApproval.ApprovalDate = Convert.ToDateTime(this.txtApprovalDate.Text);
+            }
+            majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim();
+            majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim();
+            majorPlanApproval.Remarks = this.txtRemarks.Text.Trim();
+            
+           
+            if (string.IsNullOrEmpty(this.Id))
+            {
+                if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
+                {
+                    majorPlanApproval.Id = this.hdAttachUrl.Text;
+                }
+                else
+                {
+                    majorPlanApproval.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_MajorPlanApproval));
+                    this.hdAttachUrl.Text = majorPlanApproval.Id;
+                }
+                majorPlanApproval.CreateMan = this.CurrUser.UserId;
+                majorPlanApproval.CreateDate = DateTime.Now;
+                BLL.InspectionTestPlanService.Insert(majorPlanApproval);
+            }
+            else
+            {
+                majorPlanApproval.Id = this.Id;
+                BLL.InspectionTestPlanService.Update(majorPlanApproval);
+            }
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == BLL.Const._Null)
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.Inspection_Test_PlanMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs
new file mode 100644
index 00000000..006a5798
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionTestPlanEdit.aspx.designer.cs
@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class InspectionTestPlanEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
+
+        /// <summary>
+        /// drpCNProfessionalId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCNProfessionalId;
+
+        /// <summary>
+        /// txtPlanCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPlanCode;
+
+        /// <summary>
+        /// txtPlanName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPlanName;
+
+        /// <summary>
+        /// txtApprovalDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtApprovalDate;
+
+        /// <summary>
+        /// txtAuditMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAuditMan;
+
+        /// <summary>
+        /// txtApprovalMan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtApprovalMan;
+
+        /// <summary>
+        /// Label13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label13;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemarks;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// btnAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttach;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
index 693e1215..290fa6ba 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
@@ -43,7 +43,7 @@
                 <f:FormRow>
                     <Items>
                         <f:TextBox ID="txtApprovalMan" runat="server" Label="批准人" MaxLength="50" LabelWidth="130px" LabelAlign="right"></f:TextBox>
-                        <f:Label ID="Label13" runat="server"></f:Label>
+                        <f:TextBox ID="txtExpertReviewMan" runat="server" Label="专家评审人员" MaxLength="50" LabelWidth="130px" LabelAlign="right"></f:TextBox>
                     </Items>
                 </f:FormRow>
                 <f:FormRow>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
index 089581da..678db0d6 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
@@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     this.txtAuditMan.Text = majorPlanApproval.AuditMan;
                     this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
                     this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
+                    this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan;
                 }
                 else
                 {
@@ -100,6 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
             majorPlanApproval.PlanCode = this.txtPlanCode.Text.Trim();
             majorPlanApproval.PlanName = this.txtPlanName.Text.Trim();
             majorPlanApproval.ReviewMan = this.txtReviewMan.Text.Trim();
+            majorPlanApproval.ExpertReviewMan = this.txtExpertReviewMan.Text.Trim();
             if (!string.IsNullOrEmpty(this.txtApprovalDate.Text))
             {
                 majorPlanApproval.ApprovalDate = Convert.ToDateTime(this.txtApprovalDate.Text);
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs
index 28996232..e0027020 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.CQMS.Comprehensive {
-    
-    
-    public partial class MajorPlanApprovalEdit {
-        
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class MajorPlanApprovalEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// drpUnitId 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitId;
-        
+
         /// <summary>
         /// drpCNProfessionalId 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCNProfessionalId;
-        
+
         /// <summary>
         /// drpUnitWorkIds 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWorkIds;
-        
+
         /// <summary>
         /// txtPlanCode 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPlanCode;
-        
+
         /// <summary>
         /// txtPlanName 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPlanName;
-        
+
         /// <summary>
         /// txtReviewMan 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtReviewMan;
-        
+
         /// <summary>
         /// txtApprovalDate 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtApprovalDate;
-        
+
         /// <summary>
         /// txtAuditMan 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtAuditMan;
-        
+
         /// <summary>
         /// txtApprovalMan 控件。
         /// </summary>
@@ -119,16 +121,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtApprovalMan;
-        
+
         /// <summary>
-        /// Label13 控件。
+        /// txtExpertReviewMan 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Label Label13;
-        
+        protected global::FineUIPro.TextBox txtExpertReviewMan;
+
         /// <summary>
         /// txtImplementationDeviation 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtImplementationDeviation;
-        
+
         /// <summary>
         /// Panel2 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel2;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// btnAttach 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
new file mode 100644
index 00000000..b7a3c06b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx
@@ -0,0 +1,131 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReviewDrawings.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>图纸会审管理</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="图纸收发记录" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true"
+                    SortField="CreateDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:DropDownList ID="sdrpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="70px"></f:DropDownList>
+                                <f:TextBox runat="server" ID="txtDraCode" Label="文件编号" LabelAlign="Right"></f:TextBox>
+
+                                <f:Button ID="btnSearch" Icon="SystemSearch"
+                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" Hidden="true" EnablePostBack="true" runat="server" OnClick="btnNew_Click">
+                                </f:Button>
+                               
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+
+                          <f:RenderField ColumnID="DraCode" DataField="DraCode" FieldType="String" HeaderText="编号" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+
+                         <f:RenderField ColumnID="ReviewDate" DataField="ReviewDate" FieldType="Date" Renderer="Date" HeaderText="图纸会审日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+
+                        <f:TemplateField ColumnID="UnitWorkName" Width="280px" HeaderText="单位工程名称" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="Label2" runat="server" Text='<%# ConvertUnitWork(Eval("UnitWorkId")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                      
+                       
+                        <f:TemplateField ColumnID="ReceiveUnits" Width="310px" HeaderText="参加单位" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="Label3" runat="server" Text='<%# ConvertCarryUnit(Eval("ReceiveUnits")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                       
+                               <f:TemplateField ColumnID="Status" Width="120px" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
+                            <ItemTemplate>
+                                <asp:Label ID="txtStatus" runat="server" Text='<%# ConvertState(Eval("Status")) %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                                   <f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" 
+                        Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="Id" DataIFrameUrlFormatString="./DesignDrawingsApprove.aspx?Id={0}"/>     
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("Id")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"  OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="图纸会审" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="550px">
+        </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="700px" Height="560px">
+        </f:Window>
+           <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs
new file mode 100644
index 00000000..30c1fbc6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.cs
@@ -0,0 +1,315 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class ReviewDrawings : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"SELECT C.*,CN.ProfessionalName"
+                            + @" FROM Comprehensive_ReviewDrawings C "
+                            + @" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
+                            + @" WHERE C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND C.CNProfessionalId=@CNProfessionalId";
+                listStr.Add(new SqlParameter("@CNProfessionalId", sdrpCNProfessionalId.SelectedValue));
+            }
+            if (!string.IsNullOrEmpty(this.txtDraCode.Text.Trim()))
+            {
+                strSql += " AND C.DraCode='" + txtDraCode.Text.Trim() + "'";
+
+            }
+          
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == BLL.Const._Null)
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ReviewDrawingsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuModify.Hidden = false;
+                    this.Grid1.EnableRowDoubleClickEvent = true;
+                }
+                else
+                {
+                    this.Grid1.EnableRowDoubleClickEvent = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    //this.btnImport.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 新增
+        /// <summary>
+        /// 新增按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReviewDrawingsEdit.aspx", "编辑 - ")));
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键修改
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ReviewDrawingsEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnMenuModify_Click(sender, e);
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var InspectionPerson = BLL.ReviewDrawingsService.Detail(rowID);
+                    if (InspectionPerson != null)
+                    {
+                        BLL.ReviewDrawingsService.Delete(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 格式化字符串
+        /// <summary>
+        /// 获取单位工程名称
+        /// </summary>
+        /// <param name="CarryUnitWorks"></param>
+        /// <returns></returns>
+        protected string ConvertUnitWork(object CarryUnitWorks)
+        {
+            string CarryUnitWorkName = string.Empty;
+            if (CarryUnitWorks != null)
+            {
+                string[] Ids = CarryUnitWorks.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var UnitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(t);
+                    if (UnitWork != null)
+                    {
+                        CarryUnitWorkName += UnitWork.UnitWorkName + ",";
+                    }
+                }
+            }
+            if (CarryUnitWorkName != string.Empty)
+            {
+                return CarryUnitWorkName.Substring(0, CarryUnitWorkName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        /// <summary>
+        /// 获取单位名称
+        /// </summary>
+        /// <param name="CarryUnitIds"></param>
+        /// <returns></returns>
+        protected string ConvertCarryUnit(object CarryUnitIds)
+        {
+            string CarryUnitName = string.Empty;
+            if (CarryUnitIds != null)
+            {
+                string[] Ids = CarryUnitIds.ToString().Split(',');
+                foreach (string t in Ids)
+                {
+                    var type = BLL.UnitService.GetUnitByUnitId(t);
+                    if (type != null)
+                    {
+                        CarryUnitName += type.UnitName + ",";
+                    }
+                }
+            }
+            if (CarryUnitName != string.Empty)
+            {
+                return CarryUnitName.Substring(0, CarryUnitName.Length - 1);
+            }
+            else
+            {
+                return "";
+            }
+        }
+        #endregion
+
+        public static string ConvertState(object Status)
+        {
+            if (Status != null)
+            {
+                if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReCompile)
+                {
+                    return "重报";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_ReJect)
+                {
+                    return "驳回";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Compile)
+                {
+                    return "编制";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Audit)
+                {
+                    return "待审批";
+                }
+                else if (Status.ToString().Trim() == BLL.Const.Comprehensive_Complete)
+                {
+                    return "审批完成";
+                }
+            }
+
+            return "编制";
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs
new file mode 100644
index 00000000..27acdd82
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx.designer.cs
@@ -0,0 +1,215 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class ReviewDrawings
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+
+        /// <summary>
+        /// sdrpCNProfessionalId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList sdrpCNProfessionalId;
+
+        /// <summary>
+        /// txtDraCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDraCode;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label3;
+
+        /// <summary>
+        /// txtStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label txtStatus;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx
new file mode 100644
index 00000000..ae1e621e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx
@@ -0,0 +1,107 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ReviewDrawingsEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.ReviewDrawingsEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="SimpleForm1" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow runat="server">
+                    <Items>
+                        <f:DropDownList ID="drpCNProfessionalId" runat="server" Label="专业" LabelAlign="Right" LabelWidth="130px" ShowRedStar="true"></f:DropDownList>
+                        <f:DropDownList ID="drpUnitWorkIds" runat="server" Label="单位工程名称" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextBox ID="txtDraCode" runat="server" Label="编号" MaxLength="300" LabelAlign="Right" LabelWidth="130px" Required="true" ShowRedStar="true"></f:TextBox>
+                        <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="图纸会审日期" ID="txtReviewDate" Required="true" ShowRedStar="true"
+                            LabelAlign="Right" LabelWidth="130px">
+                        </f:DatePicker>
+                    </Items>
+                </f:FormRow>
+                
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpUnitIds" runat="server" Label="参加单位" EnableCheckBoxSelect="true" EnableMultiSelect="true" LabelWidth="130px" AutoSelectFirstItem="false" LabelAlign="Right"></f:DropDownList>
+                       
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:TextArea ID="txtRemarks" runat="server" Label="备注" MaxLength="500" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label1" runat="server"  Label="上传附件"
+                                    LabelAlign="Right" LabelWidth="130px">
+                                </f:Label>
+                                <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+
+                
+                <f:FormRow MarginTop="10px">
+                    <Items>
+                        <f:DropDownList runat="server" Width="300px" Label="专业工程师确认" LabelWidth="130px" ID="drpAudit" ShowRedStar="true" Required="true" EmptyText="--请选择--">
+                        </f:DropDownList>
+                    </Items>
+                </f:FormRow>
+
+
+                <f:FormRow ID="agree">
+                    <Items>
+                        <f:RadioButtonList runat="server" ID="rblIsAgree" Label="是否同意" ShowRedStar="true">
+                            <f:RadioItem Text="同意" Value="true" Selected="true" />
+                            <f:RadioItem Text="不同意" Value="false" Selected="true" />
+                        </f:RadioButtonList>
+                    </Items>
+                </f:FormRow>
+ 
+
+                <f:FormRow ID="options">
+                    <Items>
+                        <f:TextArea ID="txtidea" ShowRedStar="true" runat="server" Label="办理意见" MaxLength="3000">
+                        </f:TextArea>
+
+                    </Items>
+                </f:FormRow>
+
+            </Rows>
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                          <f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
+                        </f:Button>
+
+                         <f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" Text="提交" ToolTip="提交" OnClick="btnSubmit_Click" ValidateForms="SimpleForm1">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
+
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
new file mode 100644
index 00000000..85226e42
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs
@@ -0,0 +1,482 @@
+using BLL;
+using BLL.CQMS.Comprehensive;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+    public partial class ReviewDrawingsEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+                BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
+                BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
+                LoadAuditSelect();
+                this.agree.Hidden = true;
+                this.options.Hidden = true;
+
+                this.btnSave.Hidden = true;
+                this.btnSubmit.Hidden = true;
+                this.Id = Request.Params["Id"];
+                var model = BLL.ReviewDrawingsService.Detail(this.Id);
+                if (model != null)
+                {
+                    this.Id = model.Id;
+                    this.hdAttachUrl.Text = this.Id;
+                    if (!string.IsNullOrEmpty(model.CNProfessionalId))
+                    {
+                        this.drpCNProfessionalId.SelectedValue = model.CNProfessionalId;
+                    }
+                    if (!string.IsNullOrEmpty(model.UnitWorkId))
+                    {
+                        this.drpUnitWorkIds.SelectedValueArray = model.UnitWorkId.Split(',');
+                    }
+                    this.txtDraCode.Text = model.DraCode;
+                  
+                    this.txtReviewDate.Text = model.ReviewDate.HasValue ? string.Format("{0:yyyy-MM-dd}", model.ReviewDate) : "";
+                    
+                    if (!string.IsNullOrEmpty(model.ReceiveUnits))
+                    {
+                        this.drpUnitIds.SelectedValueArray = model.ReceiveUnits.Split(',');
+                    }
+                    this.txtRemarks.Text = model.Remarks;
+
+
+                    var currApprove = DesignDrawingsApproveService.GetCurrentApprove(model.Id);
+                    if (currApprove != null)
+                    {   //重新编制  编制人 可以 显示 提交 保存按钮
+
+                        this.drpAudit.SelectedValue = currApprove.ApproveMan;
+                        if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && model.CreateMan == CurrUser.UserId)
+                        {
+                            this.btnSubmit.Hidden = false;
+                            this.btnSave.Hidden = false;
+                        }//审核状态 审核人 可以显示  提交 保存按钮
+                        else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
+                        {
+                            //审核状态不可编辑
+                            Readonly();
+                            this.agree.Hidden = false;
+                            this.options.Hidden = false;
+                            this.btnSubmit.Hidden = false;
+                            this.btnSave.Hidden = false;
+                        }
+                    }//没有当前审核人，已完成状态 或者 待提交状态
+                    else
+                    {
+                        if (model.Status == BLL.Const.Comprehensive_Compile && model.CreateMan == CurrUser.UserId)
+                        {
+                            this.btnSubmit.Hidden = false;
+                            this.btnSave.Hidden = false;
+                        }
+                    }
+                }
+                else
+                {
+                    this.btnSave.Hidden = false;
+                    this.btnSubmit.Hidden = false;
+                }
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// 禁止编辑
+        /// </summary>
+        public void Readonly()
+        {
+            this.txtDraCode.Readonly = true;
+            this.txtReviewDate.Readonly = true;
+            this.drpCNProfessionalId.Readonly = true;
+            this.drpUnitWorkIds.Readonly = true;
+            this.drpUnitIds.Readonly = true;
+            this.txtRemarks.Readonly = true;
+            this.txtReviewDate.Readonly = true;
+            this.drpAudit.Readonly = true;
+            //this.btnAttach.Enabled = false; 
+
+        }
+
+        /// <summary>
+        /// 加载专业工程师
+        /// </summary>
+        public void LoadAuditSelect()
+        {
+
+            var db = Funs.DB;
+            var userList = from x in db.Sys_User
+                           join y in db.Project_ProjectUnit
+                           on x.UnitId equals y.UnitId
+                           join p in db.Project_ProjectUser
+                           on x.UserId equals p.UserId
+                           where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
+                           where p.RoleId.Contains(Const.ZBCNEngineer)
+                           select new { UserId = x.UserId, UserName = x.UserName };
+            drpAudit.DataValueField = "UserId";
+            drpAudit.DataTextField = "UserName";
+            this.drpAudit.DataSource = userList.ToList();
+            this.drpAudit.DataBind();
+        }
+
+
+
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ReviewDrawingsMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttach_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdAttachUrl.Text))   //新增记录
+            {
+                this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
+            }
+            Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.Id);
+            if (designDrawings == null || ((designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_Compile) || (designDrawings.CompileMan == CurrUser.UserId && designDrawings.Status == BLL.Const.Comprehensive_ReCompile)))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/CQMS/designDrawings&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ReviewDrawingsMenuId)));
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+
+            if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            var designDrawings = new Model.Comprehensive_ReviewDrawings();
+            designDrawings.ProjectId = this.CurrUser.LoginProjectId;
+            designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
+            designDrawings.DraCode = this.txtDraCode.Text.Trim();
+            designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text);
+            designDrawings.Remarks = this.txtRemarks.Text.Trim();
+            designDrawings.CreateMan = this.CurrUser.UserId;
+            designDrawings.CreateDate = DateTime.Now;
+            //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
+            //{
+            //    designDrawings.AuditMan = drpAudit.SelectedValue;
+            //}   //审核人
+            string ids = string.Empty;
+            var lists = this.drpUnitWorkIds.SelectedValueArray;
+            foreach (var item in lists)
+            {
+                ids += item + ",";
+            }
+            if (!string.IsNullOrEmpty(ids))
+            {
+                ids = ids.Substring(0, ids.LastIndexOf(","));
+            }
+            designDrawings.UnitWorkId = ids;
+
+            string unitIds = string.Empty;
+            var unitLists = this.drpUnitIds.SelectedValueArray;
+            foreach (var item in unitLists)
+            {
+                unitIds += item + ",";
+            }
+            if (!string.IsNullOrEmpty(unitIds))
+            {
+                unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+            }
+            designDrawings.ReceiveUnits = unitIds;
+            if (!string.IsNullOrEmpty(this.Id))
+            {
+                designDrawings.Id = this.Id;
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
+
+                var model = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault();
+                if (model != null)
+                {
+
+                    designDrawings.Status = model.Status;
+                }
+                BLL.ReviewDrawingsService.Update(designDrawings);
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
+                {
+                    designDrawings.Id = this.hdAttachUrl.Text;
+                }
+                else
+                {
+                    designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
+                    this.hdAttachUrl.Text = designDrawings.Id;
+                }
+
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
+                designDrawings.Status = BLL.Const.Comprehensive_Compile;
+                BLL.ReviewDrawingsService.Insert(designDrawings);
+            }
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+
+        }
+
+
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
+                return;
+            }
+            var designDrawings = new Model.Comprehensive_ReviewDrawings();
+            designDrawings.ProjectId = this.CurrUser.LoginProjectId;
+            designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
+            designDrawings.DraCode = this.txtDraCode.Text.Trim();
+            designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text);
+            designDrawings.Remarks = this.txtRemarks.Text.Trim();
+            designDrawings.CreateMan = this.CurrUser.UserId;
+            designDrawings.CreateDate = DateTime.Now;
+            //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
+            //{
+            //    designDrawings.AuditMan = drpAudit.SelectedValue;
+            //}   //审核人
+            string ids = string.Empty;
+            var lists = this.drpUnitWorkIds.SelectedValueArray;
+            foreach (var item in lists)
+            {
+                ids += item + ",";
+            }
+            if (!string.IsNullOrEmpty(ids))
+            {
+                ids = ids.Substring(0, ids.LastIndexOf(","));
+            }
+            designDrawings.UnitWorkId = ids;
+
+            string unitIds = string.Empty;
+            var unitLists = this.drpUnitIds.SelectedValueArray;
+            foreach (var item in unitLists)
+            {
+                unitIds += item + ",";
+            }
+            if (!string.IsNullOrEmpty(unitIds))
+            {
+                unitIds = unitIds.Substring(0, unitIds.LastIndexOf(","));
+            }
+            designDrawings.ReceiveUnits = unitIds;
+            if (!string.IsNullOrEmpty(this.Id))
+            {
+                designDrawings.Id = this.Id;
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.Id);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
+                //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings);
+                var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault();
+                if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态
+                {
+                    designDrawings.CreateMan = this.CurrUser.UserId;
+                    designDrawings.Status = BLL.Const.Comprehensive_Audit;
+                    BLL.ReviewDrawingsService.Insert(designDrawings);
+                }
+                else
+                {
+                  
+                    if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
+                    {
+                        designDrawings.Status = BLL.Const.Comprehensive_Audit;
+                    }
+                    else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
+                    {
+                        designDrawings.Status = BLL.Const.Comprehensive_Audit;
+                    }
+                    else //审核状态  提交 变 完成 或者 重新编制
+                    {
+                        if (Convert.ToBoolean(rblIsAgree.SelectedValue))
+                        {
+                            designDrawings.Status = BLL.Const.Comprehensive_Complete;
+                        }
+                        else
+                        {
+                            designDrawings.Status = BLL.Const.Comprehensive_ReCompile;
+                        }
+                    }
+
+                    BLL.ReviewDrawingsService.Update(designDrawings);
+
+                }
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
+                {
+                    designDrawings.Id = this.hdAttachUrl.Text;
+                }
+                else
+                {
+                    designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
+                    this.hdAttachUrl.Text = designDrawings.Id;
+                }
+
+                //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == designDrawings.DesignDrawingsId);
+                //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
+                //{
+                //    Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
+                //    return;
+                //}
+                designDrawings.Status = BLL.Const.Comprehensive_Audit;
+                BLL.ReviewDrawingsService.Insert(designDrawings);
+            }
+
+
+
+
+
+            #region 审核记录
+
+            var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.Id);
+            if (currApprove == null) //为获取到为 当前编制状态 直接提交
+            {
+                var approve = new Model.Comprehensive_DesignDrawingsApprove();
+                approve.DesignDrawingsId = designDrawings.Id;
+                approve.ApproveMan = this.CurrUser.UserId;
+                approve.ApproveType = Const.Comprehensive_Compile;
+                approve.ApproveDate = DateTime.Now;
+                DesignDrawingsApproveService.EditApprove(approve);  //新增编制记录
+
+
+                Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
+                newApprove.DesignDrawingsId = designDrawings.Id;
+                newApprove.ApproveMan = this.drpAudit.SelectedValue;
+                newApprove.ApproveType = Const.InspectionManagement_Audit;
+                DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
+
+            }
+            else if (currApprove.ApproveMan == CurrUser.UserId)
+            {
+                if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
+                {
+                    currApprove.ApproveDate = DateTime.Now;
+                    //currApprove.IsAgree = true;
+                    DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录
+                    Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove();
+                    newApprove.DesignDrawingsId = designDrawings.Id;
+                    newApprove.ApproveMan = this.drpAudit.SelectedValue;
+                    newApprove.ApproveType = Const.InspectionManagement_Audit;
+                    DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录
+                }
+                else
+                {
+                    currApprove.ApproveDate = DateTime.Now;  //更新审核时间
+                    currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
+                    currApprove.ApproveIdea = this.txtidea.Text;
+                    DesignDrawingsApproveService.EditApprove(currApprove);
+
+                    if (Convert.ToBoolean(rblIsAgree.SelectedValue))  //同意时 审批完成
+                    {
+                        Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
+                        reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
+                        reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
+                        reApprove.ApproveMan = CurrUser.UserId;
+                        reApprove.ApproveType = Const.Comprehensive_Complete;
+                        // reApprove.ApproveIdea = txtidea.Text;
+                        DesignDrawingsApproveService.EditApprove(reApprove);
+                    }
+                    else
+                    {
+                        Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove();
+                        reApprove.DesignDrawingsId = currApprove.DesignDrawingsId;
+                        reApprove.ApproveMan = designDrawings.CreateMan;
+                        reApprove.ApproveType = Const.Comprehensive_ReCompile;
+                        DesignDrawingsApproveService.EditApprove(reApprove);
+                    }
+                }
+            }
+
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+
+            #endregion
+
+
+
+        }
+
+        /// <summary>
+        /// 保存方法
+        /// </summary>
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs
new file mode 100644
index 00000000..63a5870b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs
@@ -0,0 +1,215 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+
+
+    public partial class ReviewDrawingsEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpCNProfessionalId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCNProfessionalId;
+
+        /// <summary>
+        /// drpUnitWorkIds 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitWorkIds;
+
+        /// <summary>
+        /// txtDraCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDraCode;
+
+        /// <summary>
+        /// txtReviewDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtReviewDate;
+
+        /// <summary>
+        /// drpUnitIds 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitIds;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemarks;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// btnAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttach;
+
+        /// <summary>
+        /// drpAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpAudit;
+
+        /// <summary>
+        /// agree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow agree;
+
+        /// <summary>
+        /// rblIsAgree 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblIsAgree;
+
+        /// <summary>
+        /// options 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FormRow options;
+
+        /// <summary>
+        /// txtidea 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtidea;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnSubmit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSubmit;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
index aa9993bd..d29af678 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx
@@ -15,7 +15,8 @@
             <Items>
                 <f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="true" SortField="StartDate" 
                     DataIDField="Id" SortDirection="DESC" BoxFlex="1" AllowCellEditing="true"
-                    DataKeyNames="Id" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
+                    DataKeyNames="Id" EnableColumnLines="true" ClicksToEdit="2" AllowSorting="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" 
+                    OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true" OnRowDoubleClick="Grid1_RowDoubleClick"  EnableRowDoubleClickEvent="true"
                     AllowFilters="true" EnableTextSelection="True">
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
index 20d19bfd..52454509 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
@@ -66,6 +66,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             return date;
         }
 
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportEdit.aspx?reportId=" + Grid1.SelectedRowID, "添加 - ")));
+        }
+
+
         protected void btnNew_Click(object sender, EventArgs e)
         {
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportEdit.aspx", "添加 - ")));
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
index 2e9a68c0..0b620555 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
@@ -8,24 +8,29 @@
     <title>编辑施工质量周报(新)</title>
     <base target="_self" />
     <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
-    
+
     <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <style>
         /*.myIframe {
             overflow: hidden;*/ /* 隐藏滚动条 */
-            /*height: 100%;*/ /* 根据需要调整高度 */
+        /*height: 100%;*/ /* 根据需要调整高度 */
         /*}*/
     </style>
-  <style>
-      .Toolbar2 {
-        position: absolute;
-        z-index: 999999;
-        right: 0;
-        width: 83px;
-        top: -43px;
-        background-color: rgba(0, 0, 0, 0);
-      }
-  </style>
+    <style>
+        .Toolbar2 {
+            position: absolute;
+            z-index: 999999;
+            right: 0;
+            width: 83px;
+            top: -43px;
+            background-color: rgba(0, 0, 0, 0);
+        }
+
+        .f-grid-row-summary .f-grid-cell-inner {
+            font-weight: bold;
+            color: red;
+        }
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -95,13 +100,22 @@
                                 <td align="right" style="width: 10%">时间段&nbsp;
                                 </td>
                                 <td align="left" style="width: 90%">
-                                    <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                    <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" ID="txtStartDate" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" CssStyle="    margin-top: 10px;"
+                                        LabelAlign="right">
+                                    </f:DatePicker>
+                                    <f:Label ID="Label3" runat="server" Text="至">
+                                    </f:Label>
+                                    <f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" ID="txtEndDate" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
+                                        LabelAlign="right">
+                                    </f:DatePicker>
+
+                                    <%-- <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
                                         onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
                                         OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
                                     —
                             <asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
                                 onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
-                                OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged"></asp:TextBox>--%>
                                 </td>
                             </tr>
                         </table>
@@ -131,87 +145,84 @@
                         </table>
                      </td>
                 </tr>--%>
-
-
-
             </table>
             <%--1.本月质量目标管理情况--%>
             <f:Panel ID="Panel4" IsFluid="true" Title="1.本月质量目标管理情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
                 ShowHeader="true">
                 <Toolbars>
-                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
-                          <Items>
-                          <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
-                        </f:Button>
-                              </Items>
-                     </f:Toolbar>
+                    <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
+                        <Items>
+                            <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                            </f:Button>
+                        </Items>
+                    </f:Toolbar>
                 </Toolbars>
                 <Items>
-                <f:Form ID="Form5" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" >
-                    <Rows>
-                        <f:FormRow>
-                            <Items>
-                                   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
-                                DataKeyNames="Id" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC" 
-                                 AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
-                                EnableTextSelection="True">
-                                <Columns>
-                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
-                                        TextAlign="Center" />
+                    <f:Form ID="Form5" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
+                                        DataKeyNames="Id" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
+                                        EnableTextSelection="True">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
-                                    <f:RenderField Width="150px" ColumnID="ProStage" DataField="ProStage"
-                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
-                                        <Editor>
-                                            <f:TextBox ID="txtProStage" runat="server">
-                                            </f:TextBox>
-                                        </Editor>
-                                    </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="ProStage" DataField="ProStage"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
+                                                <Editor>
+                                                    <f:TextBox ID="txtProStage" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
 
-                                     <f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
-                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述">
-                                        <Editor>
-                                            <f:TextBox ID="txtProDescribe" runat="server">
-                                            </f:TextBox>
-                                        </Editor>
-                                    </f:RenderField>
+                                            <f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述">
+                                                <Editor>
+                                                    <f:TextBox ID="txtProDescribe" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
 
-                                    <f:RenderField Width="100px" ColumnID="TargetValue" DataField="TargetValue"
-                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
-                                        <Editor>
-                                            <f:TextBox ID="txtTargetValue" runat="server">
-                                            </f:TextBox>
-                                        </Editor>
-                                    </f:RenderField>
+                                            <f:RenderField Width="100px" ColumnID="TargetValue" DataField="TargetValue"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
+                                                <Editor>
+                                                    <f:TextBox ID="txtTargetValue" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
 
-                                    <f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
-                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
-                                        <Editor>
-                                            <f:TextBox ID="txtMonthPer" runat="server">
-                                            </f:TextBox>
-                                        </Editor>
-                                    </f:RenderField>
+                                            <f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
+                                                <Editor>
+                                                    <f:TextBox ID="txtMonthPer" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
 
-                                    <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
-                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
-                                        <Editor>
-                                            <f:TextBox ID="txtRemarks" runat="server">
-                                            </f:TextBox>
-                                        </Editor>
-                                    </f:RenderField>
+                                            <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="txtRemarks" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
 
 
-                                    <f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
-                                        HeaderTextAlign="Center" HeaderText="删除" />
-                                </Columns>
-                                <Listeners>
-                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
-                                </Listeners>
-                            </f:Grid>
+                                            <f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
+                                                HeaderTextAlign="Center" HeaderText="删除" />
+                                        </Columns>
+                                        <Listeners>
+                                            <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                        </Listeners>
+                                    </f:Grid>
                                 </Items>
-                        </f:FormRow>
-                    </Rows>
-                </f:Form>
-            </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
             </f:Panel>
 
             <%--2.本月主要工作内容--%>
@@ -219,13 +230,13 @@
                 ShowHeader="true">
                 <Items>
                     <f:Panel ID="Panel6" IsFluid="true" Title="2.1 设计质量情况" runat="server" EnableCollapse="false"
-                ShowHeader="true">
+                        ShowHeader="true">
                         <Items>
                             <f:Form ID="Form6" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                           <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容" 
+                                            <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容"
                                                 AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
                                             </f:TextArea>
                                         </Items>
@@ -233,16 +244,16 @@
                                 </Rows>
                             </f:Form>
                         </Items>
-                     </f:Panel>
+                    </f:Panel>
 
                     <f:Panel ID="Panel7" IsFluid="true" Title="2.2 采购质量情况" runat="server" EnableCollapse="false"
-                ShowHeader="true">
+                        ShowHeader="true">
                         <Items>
                             <f:Form ID="Form7" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                           <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容" 
+                                            <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容"
                                                 AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
                                             </f:TextArea>
                                         </Items>
@@ -250,16 +261,16 @@
                                 </Rows>
                             </f:Form>
                         </Items>
-                     </f:Panel>
+                    </f:Panel>
 
                     <f:Panel ID="Panel8" IsFluid="true" Title="2.3 施工质量情况" runat="server" EnableCollapse="false"
-                ShowHeader="true">
+                        ShowHeader="true">
                         <Items>
                             <f:Form ID="Form8" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                           <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容" 
+                                            <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容"
                                                 AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
                                             </f:TextArea>
                                         </Items>
@@ -267,87 +278,640 @@
                                 </Rows>
                             </f:Form>
                         </Items>
-                     </f:Panel>
-                      
+                    </f:Panel>
+
                 </Items>
             </f:Panel>
 
-             <f:Panel ID="Panel9" IsFluid="true" Title="3.施工方案及检验试验计划审批情况" runat="server" EnableCollapse="false"
+            <%--3.施工方案及检验试验计划审批情况--%>
+
+            <f:Panel ID="Panel9" IsFluid="true" Title="3.施工方案及检验试验计划审批情况" runat="server" EnableCollapse="false"
                 ShowHeader="true">
                 <Items>
 
-                      <f:Panel ID="Panel10" IsFluid="true" Title="3.1 一般施工方案审批情况" runat="server" EnableCollapse="false"
-                ShowHeader="true">
+                    <f:Panel ID="Panel10" IsFluid="true" Title="3.1 一般施工方案审批情况" runat="server" EnableCollapse="false"
+                        ShowHeader="true">
                         <Items>
                             <f:Form ID="Form9" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                            
+                                            <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                                DataKeyNames="Id" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="报审单位">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月审批完成数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="160px" ColumnID="Quantity2" DataField="Quantity2"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计审批完成数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                        <Editor>
+                                                            <f:TextBox ID="TextBox5" runat="server">
+                                                            </f:TextBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+
+
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                </Listeners>
+                                            </f:Grid>
                                         </Items>
                                     </f:FormRow>
                                 </Rows>
                             </f:Form>
                         </Items>
-                     </f:Panel>
+                    </f:Panel>
 
+                    <f:Panel ID="Panel11" IsFluid="true" Title="3.2 危大工程方案审批情况" runat="server" EnableCollapse="false"
+                        ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form10" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                                DataKeyNames="Id" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="报审单位">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月审批完成数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="160px" ColumnID="Quantity2" DataField="Quantity2"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计审批完成数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="160px" ColumnID="Quantity3" DataField="Quantity3"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="已通过专家评审">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                        <Editor>
+                                                            <f:TextBox ID="TextBox1" runat="server">
+                                                            </f:TextBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+
+
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                </Listeners>
+                                            </f:Grid>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                    </f:Panel>
+
+                    <f:Panel ID="Panel12" IsFluid="true" Title="3.3 质量控制点或检验试验计划（ITP）情况" runat="server" EnableCollapse="false"
+                        ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form11" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Grid ID="Grid4" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                                DataKeyNames="Id" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="专业">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成上报数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="160px" ColumnID="Quantity2" DataField="Quantity2"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成上报数量">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                        <Editor>
+                                                            <f:TextBox ID="TextBox2" runat="server">
+                                                            </f:TextBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+
+
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                </Listeners>
+                                            </f:Grid>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                    </f:Panel>
 
                 </Items>
             </f:Panel>
 
+            <%--4.设计交底管理情况--%>
+            <f:Panel ID="Panel13" IsFluid="true" Title="4.设计交底管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form12" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="Grid5" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
 
-             <%--20.项目质量体系审核--%>
+                                            <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="专业">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成交底数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="160px" ColumnID="Quantity2" DataField="Quantity2"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成交底数量">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox3" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+
+
+
+                                        </Columns>
+                                        <Listeners>
+                                            <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                        </Listeners>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+
+            <%--5.图纸会审管理情况--%>
+            <f:Panel ID="Panel14" IsFluid="true" Title="5.图纸会审管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form13" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="Grid6" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="专业">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月完成图纸会审次数">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Quantity2" DataField="Quantity2"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计完成图纸会审次数">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox4" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+
+
+
+                                        </Columns>
+                                        <Listeners>
+                                            <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                        </Listeners>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+
+            <%--6.设计变更管理情况--%>
+            <f:Panel ID="Panel15" IsFluid="true" Title="6.设计变更管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form14" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="Grid7" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Num"
+                                        DataKeyNames="Num" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="WorkName" DataField="WorkName"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="专业">
+                                            </f:RenderField>
+
+                                            <f:GroupField HeaderText="发布数量" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="100px" ColumnID="CheckNum" DataField="CheckNum" HeaderText="本月" />
+                                                    <f:BoundField Width="100px" ColumnID="TotalCheckNum" DataField="TotalCheckNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="业主批准数量" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OKNum" DataField="OKNum" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOKNum" DataField="TotalOKNum" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                            <f:GroupField HeaderText="完成情况" TextAlign="Center">
+                                                <Columns>
+                                                    <f:BoundField Width="150px" ColumnID="OneOKRate" DataField="OneOKRate" HeaderText="本月" />
+                                                    <f:BoundField Width="150px" ColumnID="TotalOneOKRate" DataField="TotalOneOKRate" HeaderText="累计" />
+                                                </Columns>
+                                            </f:GroupField>
+
+                                        </Columns>
+                                        <Listeners>
+                                            <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                        </Listeners>
+                                    </f:Grid>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+
+            <%--7.焊接管理情况--%>
+            <f:Panel ID="Panel16" IsFluid="true" Title="7.焊接管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Panel ID="Panel17" IsFluid="true" Title="7.1 合格焊工管理情况" runat="server" EnableCollapse="false"
+                        ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form15" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Grid ID="Grid8" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Num"
+                                                DataKeyNames="Num" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="分包商">
+                                                    </f:RenderField>
+
+                                                    <f:GroupField HeaderText="管道焊工" TextAlign="Center">
+                                                        <Columns>
+                                                            <f:BoundField Width="100px" ColumnID="PipeMountGuard" DataField="PipeMountGuard" HeaderText="本月上岗" />
+                                                            <f:BoundField Width="100px" ColumnID="PipeTotal" DataField="PipeTotal" HeaderText="累计" />
+                                                        </Columns>
+                                                    </f:GroupField>
+
+                                                    <f:GroupField HeaderText="钢结构焊工" TextAlign="Center">
+                                                        <Columns>
+                                                            <f:BoundField Width="100px" ColumnID="SteelStructureMountGuard" DataField="SteelStructureMountGuard" HeaderText="本月上岗" />
+                                                            <f:BoundField Width="100px" ColumnID="SteelStructureTotal" DataField="SteelStructureTotal" HeaderText="累计" />
+                                                        </Columns>
+                                                    </f:GroupField>
+
+                                                    <f:GroupField HeaderText="设备焊工" TextAlign="Center">
+                                                        <Columns>
+                                                            <f:BoundField Width="100px" ColumnID="EquipmentMountGuard" DataField="EquipmentMountGuard" HeaderText="本月上岗" />
+                                                            <f:BoundField Width="100px" ColumnID="EquipmentTotal" DataField="EquipmentTotal" HeaderText="累计" />
+                                                        </Columns>
+                                                    </f:GroupField>
+
+                                                    <f:GroupField HeaderText="其他" TextAlign="Center">
+                                                        <Columns>
+                                                            <f:BoundField Width="100px" ColumnID="OtherMountGuard" DataField="OtherMountGuard" HeaderText="本月上岗" />
+                                                            <f:BoundField Width="100px" ColumnID="OtherTotal" DataField="OtherTotal" HeaderText="累计" />
+                                                        </Columns>
+                                                    </f:GroupField>
+
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                </Listeners>
+                                            </f:Grid>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                    </f:Panel>
+
+                    <f:Panel ID="Panel18" IsFluid="true" Title="7.2 PQR/WPS报验情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
+                        ShowHeader="true">
+                        <Toolbars>
+                            <f:Toolbar ID="Toolbar3" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
+                                <Items>
+                                    <f:Button ID="Button4" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid9_Click">
+                                    </f:Button>
+                                </Items>
+                            </f:Toolbar>
+                        </Toolbars>
+                        <Items>
+                            <f:Form ID="Form16" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Grid ID="Grid9" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
+                                                DataKeyNames="Id" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid9_PreDataBound"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="350px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="报审单位">
+                                                        <Editor>
+                                                            <f:DropDownList ID="drpUnitIdGrid9" runat="server" Required="true" ShowRedStar="true" EnableEdit="true">
+                                                            </f:DropDownList>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="130px" ColumnID="Quantity1" DataField="Quantity1"
+                                                        FieldType="int" HeaderTextAlign="Center" TextAlign="Left" HeaderText="PQR批准批次">
+                                                        <Editor>
+                                                            <f:NumberBox ID="TextBox7" runat="server" NoDecimal="true" NoNegative="true">
+                                                            </f:NumberBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="130px" ColumnID="Quantity2" DataField="Quantity2"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="WPS批准数量">
+                                                        <Editor>
+                                                            <f:NumberBox ID="TextBox8" runat="server" NoDecimal="true" NoNegative="true">
+                                                            </f:NumberBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="250px" ColumnID="Remarks" DataField="Remarks"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                        <Editor>
+                                                            <f:TextBox ID="TextBox10" runat="server">
+                                                            </f:TextBox>
+                                                        </Editor>
+                                                    </f:RenderField>
+
+
+                                                    <f:LinkButtonField ColumnID="Delete9" Width="50px" EnablePostBack="false" Icon="Delete"
+                                                        HeaderTextAlign="Center" HeaderText="删除" />
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                </Listeners>
+                                            </f:Grid>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+
+                        </Items>
+                    </f:Panel>
+
+                    <f:Panel ID="Panel19" IsFluid="true" Title="7.3 无损检测管理情况" runat="server" EnableCollapse="false"
+                        ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form17" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Grid ID="Grid10" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                                DataKeyNames="Id" ShowGridHeader="true"
+                                                AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                                EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                                <Columns>
+                                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                        TextAlign="Center" />
+
+                                                    <f:RenderField Width="240px" ColumnID="CreateMan" DataField="CreateMan"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="施工单位">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="120px" ColumnID="ProfessionalName" DataField="ProfessionalName"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="专业">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="180px" ColumnID="MonthQuantity" DataField="MonthQuantity"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月拍片数">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="180px" ColumnID="TotalQuantity" DataField="TotalQuantity"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计拍片数">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="180px" ColumnID="MonthRate" DataField="MonthRate"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月一次合格率">
+                                                    </f:RenderField>
+
+                                                    <f:RenderField Width="180px" ColumnID="TotalRate" DataField="TotalRate"
+                                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计一次合格率">
+                                                    </f:RenderField>
+                                                </Columns>
+                                                <Listeners>
+                                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                                    <f:Listener Event="dataload" Handler="onGrid10DataLoad" />
+                                                </Listeners>
+                                            </f:Grid>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                    </f:Panel>
+
+                </Items>
+            </f:Panel>
+
+            <%--8.设备材料报验管理情况--%>
+            <f:Panel ID="Panel20" IsFluid="true" Title="8 设备材料报验管理情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Form ID="Form18" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:Grid ID="Grid11" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id"
+                                        DataKeyNames="Id" ShowGridHeader="true"
+                                        AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true"
+                                        EnableTextSelection="True" EnableSummary="true" SummaryPosition="Bottom">
+                                        <Columns>
+                                            <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                                TextAlign="Center" />
+
+                                            <f:RenderField Width="240px" ColumnID="UnitOrMajor" DataField="UnitOrMajor"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="上报单位">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="250px" ColumnID="Quantity1" DataField="Quantity1"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月报验批次">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="160px" ColumnID="Quantity2" DataField="Quantity2"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="累计报验批次">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="160px" ColumnID="QuaRate" DataField="QuaRate"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="验收合格率">
+                                            </f:RenderField>
+
+                                            <f:RenderField Width="200px" ColumnID="Remarks" DataField="Remarks"
+                                                FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                                <Editor>
+                                                    <f:TextBox ID="TextBox6" runat="server">
+                                                    </f:TextBox>
+                                                </Editor>
+                                            </f:RenderField>
+
+
+
+                                        </Columns>
+                                        <Listeners>
+                                            <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                        </Listeners>
+                                    </f:Grid>
+                                </Items>
+                               
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+                  <Toolbars>
+                      <f:Toolbar ID="Toolbar4" Position="bottom" ToolbarAlign="left" runat="server" >
+                          <Items>
+                              <f:Button ID="Button5" Icon="Add" runat="server" ToolTip="增加" Text="增加" OnClick="btnAddGrid11_Click">
+                              </f:Button>
+                          </Items>
+                      </f:Toolbar>
+                  </Toolbars>
+                <Items>
+                     <f:Form ID="Form19" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" Hidden="true">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:TextArea runat="server" ID="txtAre8" EmptyText="请填写内容" Text="本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批"
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                    </f:TextArea>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
+            </f:Panel>
+
+            <%--20.项目质量体系审核--%>
             <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
                 ShowHeader="true">
                 <Items>
-                <f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
-                    <Rows>
-                        <f:FormRow>
-                            <Items>
-                               <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容" 
-                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
-                                </f:TextArea>
-                            </Items>
-                        </f:FormRow>
-                    </Rows>
-                </f:Form>
-            </Items>
+                    <f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容"
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                    </f:TextArea>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
             </f:Panel>
 
             <%--21.类似项目管理经验教训应对措施及跟踪--%>
             <f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
                 ShowHeader="true">
                 <Items>
-                <f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
-                    <Rows>
-                        <f:FormRow>
-                            <Items>
-                               <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容" 
-                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
-                                </f:TextArea>
-                            </Items>
-                        </f:FormRow>
-                    </Rows>
-                </f:Form>
-            </Items>
+                    <f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容"
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                    </f:TextArea>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
             </f:Panel>
 
             <%--22.附件--%>
-             <f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
+            <f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
                 ShowHeader="true">
                 <Items>
-                <f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
-                    <Rows>
-                        <f:FormRow>
-                            <Items>
-                               <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容" 
-                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
-                                </f:TextArea>
-                            </Items>
-                        </f:FormRow>
-                    </Rows>
-                </f:Form>
-            </Items>
+                    <f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                        <Rows>
+                            <f:FormRow>
+                                <Items>
+                                    <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容"
+                                        AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                    </f:TextArea>
+                                </Items>
+                            </f:FormRow>
+                        </Rows>
+                    </f:Form>
+                </Items>
             </f:Panel>
 
             <Toolbars>
@@ -359,7 +923,7 @@
                         <f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
                         </f:Button>
 
-                       
+
 
                         <f:HiddenField ID="hdId" runat="server">
                         </f:HiddenField>
@@ -374,6 +938,8 @@
             ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
 
         <input runat="server" type="hidden" id="hidReportId" />
+
+
     </form>
 </body>
 </html>
@@ -383,4 +949,8 @@
         //F(menuID).show();  //showAt(event.pageX, event.pageY);
         return false;
     }
+
+    function onGrid10DataLoad(event) {
+        this.mergeColumns(['CreateMan']);
+    }
 </script>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index dea66671..38c58b0c 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
-using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using BLL;
 using Newtonsoft.Json.Linq;
-using AspNet = System.Web.UI.WebControls;
+
 namespace FineUIPro.Web.CQMS.ManageReportNew
 {
     public partial class MonthReportEdit : PageBase
@@ -45,6 +43,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #region 列表集合
         private static List<Model.Report_CqmsTarget> detailsGrid1 = new List<Model.Report_CqmsTarget>();
         #endregion
+
         #region 加载页面
         /// <summary>
         /// 加载页面
@@ -55,6 +54,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             if (!IsPostBack)
             {
+                BLL.UnitService.InitUnitDownListByText(this.drpUnitIdGrid9, this.CurrUser.LoginProjectId, true);
                 this.EnableViewState = true;
                 this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
                 this.ReportId = Request.Params["reportId"];
@@ -87,10 +87,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     #region 加载本月质量目标管理情况 
                     detailsGrid1.Clear();
                     detailsGrid1 = (from x in Funs.DB.Report_CqmsTarget
-                                        where x.ReportId == this.ReportId
-                                        orderby x.SortId
-                                        select x).ToList();
-                    if (detailsGrid1.Count>0)
+                                    where x.ReportId == this.ReportId
+                                    orderby x.SortId
+                                    select x).ToList();
+                    if (detailsGrid1.Count > 0)
                     {
                         Grid1.Hidden = false;
                         Grid1.DataSource = detailsGrid1;
@@ -99,6 +99,29 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
                     #endregion
 
+                    #region 加载7.2 PQR/WPS报验情况
+                    var detailsGrid9 = (from x in Funs.DB.Report_Construction_Plan
+                                        where x.ReportId == ReportId && x.ReType == "5"
+                                        select x).ToList();
+                    if (detailsGrid9.Count > 0)
+                    {
+                        Grid9.Hidden = false;
+                        Grid9.DataSource = detailsGrid9;
+                        Grid9.DataBind();
+                    }
+                    if (!string.IsNullOrEmpty(Request.Params["view"]))
+                    {
+                        //查看页面
+                        Button4.Hidden = true;
+                        Button3.Hidden = true;
+                        //合计
+                        OutPutSummaryGrid9();
+                        Grid1.FindColumn("Delete1").Hidden = true;
+                        Grid9.FindColumn("Delete9").Hidden = true;
+                    }
+                    #endregion
+
+
                     #region 加载文本框内容
                     var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
                     txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
@@ -108,8 +131,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
                     txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
                     txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    txtAre8.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
+                    if (txtAre8.Text != "本月报验的主要材料钢筋、水泥、预应力xxx等，其中现场抽检xx批，合格xx批")
+                    {
+                        Form19.Hidden = false;
+                        Toolbar4.Hidden = true;
+                    }
                     #endregion
 
+                    //加载所有grid
+                    lodAllGrid("1");
 
                 }
                 else
@@ -119,10 +150,47 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     //给个新的主键
                     ReportId = Guid.NewGuid().ToString();
                     AddOrUpdate = "add";
+
+                    //加载所有grid
+                    lodAllGrid("0");
                 }
                 hidReportId.Value = ReportId;
             }
         }
+
+        /// <summary>
+        /// 加载grid
+        /// </summary>
+        /// <param name="objType"></param>
+        void lodAllGrid(string objType)
+        {
+            //3.1 加载一般施工方案审批情况
+            loadGeneralPlanApproval(objType);
+
+            //3.2 加载危大工程方案审批情况
+            loadMajorPlanApproval(objType);
+
+            //3.3 质量控制点或检验试验计划（ITP）情况
+            loadInspectionTestPlan(objType);
+
+            //4 加载设计交底管理情况
+            loadDesignDetailsApprove(objType);
+
+            //5 加载图纸会审管理情况
+            loadReviewDrawings(objType);
+
+            //6 加载设计变更管理情况
+            loadDesignChangeOrder();
+
+            //7.1 加载合格焊工管理情况
+            loadPassWelder();
+
+            //7.3 加载无损检测管理
+            loadProcessControl_NondestructiveTest_New();
+
+            //8 设备报验管理Grid11
+            LoadInspectionEquipment(objType);
+        }
         #endregion
 
         #region 时间选择事件
@@ -143,10 +211,32 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text);
             }
         }
+
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()) && !string.IsNullOrEmpty(this.txtEndDate.Text.Trim()))
+            {
+
+                if (Funs.GetNewDateTime(this.txtStartDate.Text.Trim()) > Funs.GetNewDateTime(this.txtEndDate.Text.Trim()))
+                {
+                    Alert.ShowInTop("开始时间不能大于结束时间！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (AddOrUpdate == "update")
+                {
+                    lodAllGrid("1");
+                }
+                else
+                {
+                    lodAllGrid("0");
+                }
+            }
+        }
         #endregion
 
         #region 本月质量目标管理情况 Grid1方法
-        protected void btnAddGrid1_Click(object sender, EventArgs e) {
+        protected void btnAddGrid1_Click(object sender, EventArgs e)
+        {
             Grid1.Hidden = false;
 
             JArray teamGroupData = Grid1.GetMergedData();
@@ -189,6 +279,1010 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         }
         #endregion
 
+        #region 3.1一般施工方案审批情况 Grid2方法
+        /// <summary>
+        /// 加载一般施工审批情况
+        /// </summary>
+        void loadGeneralPlanApproval(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            //加载所有单位
+            var units = from x in Funs.DB.Project_ProjectUnit
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
+                        orderby y.UnitCode
+                        select new { x.UnitId, y.UnitName };
+            foreach (var item in units)
+            {
+
+                var query = from c in db.Comprehensive_GeneralPlanApproval
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+                            select new
+
+                            {
+                                c.ApprovalDate,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.CompileDate
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.ApprovalDate >= Convert.ToDateTime(startDate) && x.ApprovalDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.UnitName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.UnitName && x.ReType == "0");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+                i++;
+            }
+            Grid2.DataSource = list;
+            Grid2.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+
+            Grid2.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 3.2 危大工程方案审批情况 Grid3方法
+        /// <summary>
+        /// 加载一般施工审批情况
+        /// </summary>
+        void loadMajorPlanApproval(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            int Quantity3Sum = 0;
+            //加载所有单位
+            var units = from x in Funs.DB.Project_ProjectUnit
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
+                        orderby y.UnitCode
+                        select new { x.UnitId, y.UnitName };
+            foreach (var item in units)
+            {
+
+                var query = from c in db.Comprehensive_MajorPlanApproval
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+                            select new
+
+                            {
+                                c.ApprovalDate,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.ExpertReviewMan,
+                                c.CompileDate
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.ApprovalDate >= Convert.ToDateTime(startDate) && x.ApprovalDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.UnitName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+                model.Quantity3 = AllList.Where(x => x.ExpertReviewMan != "").ToList().Count();
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.UnitName && x.ReType == "1");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+                Quantity3Sum += Convert.ToInt32(model.Quantity3);
+                i++;
+            }
+            Grid3.DataSource = list;
+            Grid3.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+            summary.Add("Quantity3", Quantity3Sum.ToString());
+            Grid3.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 3.3 质量控制点或检验试验计划（ITP）情况 Grid4方法
+        /// <summary>
+        /// 加载一般施工审批情况
+        /// </summary>
+        void loadInspectionTestPlan(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            //加载所有专业
+            var CNProfessionals = from x in Funs.DB.Base_CNProfessional
+                                  where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+                                  orderby x.SortIndex
+                                  select new
+                                  {
+                                      x.CNProfessionalId,
+                                      x.ProfessionalName
+                                  };
+
+
+            foreach (var item in CNProfessionals)
+            {
+
+                var query = from c in db.Inspection_Test_Plan
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId
+                            select new
+
+                            {
+                                c.ApprovalDate,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.CreateDate
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.CreateDate >= Convert.ToDateTime(startDate) && x.CreateDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.ProfessionalName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "2");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+
+                i++;
+            }
+            Grid4.DataSource = list;
+            Grid4.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+            Grid4.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 4 设计交底管理情况 Grid5方法
+        /// <summary>
+        /// 加载一般施工审批情况
+        /// </summary>
+        void loadDesignDetailsApprove(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            //加载所有专业
+            var CNProfessionals = from x in Funs.DB.Base_CNProfessional
+                                  where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+                                  orderby x.SortIndex
+                                  select new
+                                  {
+                                      x.CNProfessionalId,
+                                      x.ProfessionalName
+                                  };
+
+
+            foreach (var item in CNProfessionals)
+            {
+
+                var query = from c in db.Comprehensive_DesignDetails
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId
+                            && c.Status == "3"
+                            select new
+
+                            {
+                                c.Status,
+                                c.CompileDate,
+                                c.ProjectId,
+
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.ProfessionalName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "3");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+
+                i++;
+            }
+            Grid5.DataSource = list;
+            Grid5.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+            Grid5.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 5 图纸会审管理情况 Grid6方法
+        /// <summary>
+        /// 加载一图纸会审管理情况
+        /// </summary>
+        void loadReviewDrawings(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            //加载所有专业
+            var CNProfessionals = from x in Funs.DB.Base_CNProfessional
+                                  where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
+                                  orderby x.SortIndex
+                                  select new
+                                  {
+                                      x.CNProfessionalId,
+                                      x.ProfessionalName
+                                  };
+
+
+            foreach (var item in CNProfessionals)
+            {
+
+                var query = from c in db.Comprehensive_ReviewDrawings
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.CNProfessionalId == item.CNProfessionalId
+                            && c.Status == "3"
+                            select new
+
+                            {
+                                c.Status,
+                                c.ReviewDate,
+                                c.ProjectId,
+
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.ReviewDate >= Convert.ToDateTime(startDate) && x.ReviewDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.ProfessionalName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.ProfessionalName && x.ReType == "4");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+
+                i++;
+            }
+            Grid6.DataSource = list;
+            Grid6.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+            Grid6.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 6 设计变更管理情况 Grid7方法
+        /// <summary>
+        /// 加载设计变更管理情况
+        /// </summary>
+        void loadDesignChangeOrder()
+        {
+            int Quantity1Sum = 0, Quantity2Sum = 0, Quantity3Sum = 0, Quantity4Sum = 0, Quantity5Sum = 0, Quantity6Sum = 0;
+
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            DateTime projectStartDate = Convert.ToDateTime("2015-01-01");
+            List<Model.CheckStatisc> StatisticsList = new List<Model.CheckStatisc>();
+            Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
+            if (project != null)
+            {
+                if (project.StartDate != null)
+                {
+                    projectStartDate = Convert.ToDateTime(project.StartDate);
+                }
+            }
+            int i = 1;
+            var cNProfessionals = from x in Funs.DB.Base_CNProfessional orderby x.SortIndex select x;
+            foreach (var item in cNProfessionals)
+            {
+                //专业下所有集合
+                List<Model.Comprehensive_DesignChangeOrder> totalManagementList = BLL.DesignChangeOrderService.GetDesignChangeOrderListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, item.CNProfessionalId, projectStartDate, DateTime.Now);
+                //专业下当期集合
+                List<Model.Comprehensive_DesignChangeOrder> managementList = BLL.DesignChangeOrderService.GetDesignChangeOrderListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, item.CNProfessionalId, startDate, endDate);
+                Model.CheckStatisc checkStatisc = new Model.CheckStatisc();
+                checkStatisc.Num = i;
+                checkStatisc.WorkName = item.ProfessionalName;
+                checkStatisc.CheckNum = managementList.Count();
+                checkStatisc.TotalCheckNum = totalManagementList.Count();
+                checkStatisc.OKNum = managementList.Count(x => x.ApprovalDate != null);
+                checkStatisc.TotalOKNum = totalManagementList.Count(x => x.ApprovalDate != null);
+                checkStatisc.OneOKRate = managementList.Count(x => x.Status == "3").ToString();       //当期完成数
+                checkStatisc.TotalOneOKRate = totalManagementList.Count(x => x.Status == "3").ToString();    //累计完成数
+
+                StatisticsList.Add(checkStatisc);
+                Quantity1Sum += checkStatisc.CheckNum;
+                Quantity2Sum += checkStatisc.TotalCheckNum;
+                Quantity3Sum += checkStatisc.OKNum;
+                Quantity4Sum += checkStatisc.TotalOKNum;
+                Quantity5Sum += Convert.ToInt32(checkStatisc.OneOKRate);
+                Quantity6Sum += Convert.ToInt32(checkStatisc.TotalOneOKRate);
+            }
+
+            Grid7.DataSource = StatisticsList;
+            Grid7.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("WorkName", "合计");
+            summary.Add("CheckNum", Quantity1Sum.ToString());
+            summary.Add("TotalCheckNum", Quantity2Sum.ToString());
+            summary.Add("OKNum", Quantity3Sum.ToString());
+            summary.Add("TotalOKNum", Quantity4Sum.ToString());
+            summary.Add("OneOKRate", Quantity5Sum.ToString());
+            summary.Add("TotalOneOKRate", Quantity6Sum.ToString());
+            Grid7.SummaryData = summary;
+        }
+
+
+        #endregion
+
+        #region 7.1 合格焊工管理情况 Grid8方法
+        /// <summary>
+        /// 加载合格焊工管理情况
+        /// </summary>
+        void loadPassWelder()
+        {
+            int Quantity1Sum = 0, Quantity2Sum = 0, Quantity3Sum = 0, Quantity4Sum = 0, Quantity5Sum = 0, Quantity6Sum = 0, Quantity7Sum = 0, Quantity8Sum = 0;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            DateTime projectStartDate = Convert.ToDateTime("2015-01-01");
+            List<Model.PassWelderStatisc> StatisticsList = new List<Model.PassWelderStatisc>();
+            Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
+            if (project != null)
+            {
+                if (project.StartDate != null)
+                {
+                    projectStartDate = Convert.ToDateTime(project.StartDate);
+                }
+            }
+            int i = 1;
+            var units = from x in Funs.DB.Project_ProjectUnit
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
+                        orderby y.UnitCode
+                        select new { x.UnitId, y.UnitName };
+            var db = Funs.DB;
+            foreach (var item in units)
+            {
+
+                var query = from c in db.Comprehensive_InspectionPerson
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+                            join cn in db.Base_CNProfessional on c.CNProfessionalId equals cn.CNProfessionalId into cnJoin
+
+                            from cn in cnJoin.DefaultIfEmpty()
+                            join p in db.Base_Post on c.PostId equals p.PostId into postJoin
+
+                            from p in postJoin.DefaultIfEmpty()
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+                            select new
+
+                            {
+                                c.InspectionPersonId,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.PersonName,
+                                c.ApprovalTime,
+                                cn.ProfessionalName,
+                                p.PostName
+
+                            };
+
+                //单位下所有集合
+                // List<Model.BS_Welder> totalWelderList = BLL.PersonManageService.GetWelderListByUnitId(this.CurrUser.LoginProjectId, item.UnitId);
+                //List<Model.BS_Welder> welderList = BLL.PersonManageService.GetWelderListByUnitIdAndDate(this.CurrUser.LoginProjectId, item.UnitId, startDate, endDate); 
+                var totalWelderList = query.ToList();
+                var welderList = query
+                    .Where(x => (x.ApprovalTime >= Convert.ToDateTime(startDate) && x.ApprovalTime <= Convert.ToDateTime(endDate)));
+                Model.PassWelderStatisc passWelderStatisc = new Model.PassWelderStatisc();
+                passWelderStatisc.Num = i;
+                passWelderStatisc.UnitName = item.UnitName;
+                passWelderStatisc.PipeMountGuard = welderList.Count(x => x.ProfessionalName == "管道" && x.PostName == "焊工");
+                passWelderStatisc.PipeTotal = totalWelderList.Count(x => x.ProfessionalName == "管道" && x.PostName == "焊工");
+                passWelderStatisc.SteelStructureMountGuard = welderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
+                passWelderStatisc.SteelStructureTotal = totalWelderList.Count(x => x.ProfessionalName == "土建" && x.PostName == "焊工");
+                passWelderStatisc.EquipmentMountGuard = welderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
+                passWelderStatisc.EquipmentTotal = totalWelderList.Count(x => x.ProfessionalName == "设备" && x.PostName == "焊工");
+                passWelderStatisc.OtherMountGuard = welderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
+                passWelderStatisc.OtherTotal = totalWelderList.Count(x => x.ProfessionalName != "管道" && x.ProfessionalName != "土建" && x.ProfessionalName != "设备" && x.PostName == "焊工");
+                StatisticsList.Add(passWelderStatisc);
+                i++;
+                Quantity1Sum += passWelderStatisc.PipeMountGuard;
+                Quantity2Sum += passWelderStatisc.PipeTotal;
+                Quantity3Sum += passWelderStatisc.SteelStructureMountGuard;
+                Quantity4Sum += passWelderStatisc.SteelStructureTotal;
+                Quantity5Sum += passWelderStatisc.EquipmentMountGuard;
+                Quantity6Sum += passWelderStatisc.EquipmentTotal;
+                Quantity7Sum += passWelderStatisc.OtherMountGuard;
+                Quantity8Sum += passWelderStatisc.OtherTotal;
+            }
+
+            Grid8.DataSource = StatisticsList;
+            Grid8.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitName", "合计");
+            summary.Add("PipeMountGuard", Quantity1Sum.ToString());
+            summary.Add("PipeTotal", Quantity2Sum.ToString());
+            summary.Add("SteelStructureMountGuard", Quantity3Sum.ToString());
+            summary.Add("SteelStructureTotal", Quantity4Sum.ToString());
+            summary.Add("EquipmentMountGuard", Quantity5Sum.ToString());
+            summary.Add("EquipmentTotal", Quantity6Sum.ToString());
+            summary.Add("OtherMountGuard", Quantity7Sum.ToString());
+            summary.Add("OtherTotal", Quantity8Sum.ToString());
+            Grid8.SummaryData = summary;
+        }
+        #endregion
+
+        #region 7.2 PQR/WPS报验情况 Grid9方法
+        protected void btnAddGrid9_Click(object sender, EventArgs e)
+        {
+            Grid9.Hidden = false;
+
+            JArray teamGroupData = Grid9.GetMergedData();
+            List<JObject> list = new List<JObject>();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                values.Add("Id", teamGroupRow.Value<string>("id"));
+                list.Add(values);
+            }
+            JObject defaultObj = new JObject
+                {   { "Id",Guid.NewGuid() },
+                    { "ReportId", ReportId },
+                    { "ReType", "2" },
+                    { "UnitOrMajor",""},
+                    { "Quantity1", "" },
+                    { "Quantity2","" },
+                    { "Remarks", "" },
+                    { "Delete9", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid9(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
+                };
+            list.Add(defaultObj);
+            Grid9.DataSource = list;
+            Grid9.DataBind();
+        }
+
+        protected void Grid9_PreDataBound(object sender, EventArgs e)
+        {
+            // 设置LinkButtonField的点击客户端事件
+            LinkButtonField deleteField = Grid9.FindColumn("Delete9") as LinkButtonField;
+            deleteField.OnClientClick = GetDeleteScriptGrid9();
+        }
+        /// <summary>
+        /// 删除提示
+        /// </summary>
+        /// <returns></returns>
+        private string GetDeleteScriptGrid9()
+        {
+            return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, Grid9.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+
+        /// <summary>
+        /// 为grid9合计行
+        /// </summary>
+        void OutPutSummaryGrid9()
+        {
+            DataTable source = ObjectToTable(Grid9.DataSource);
+            int Quantity1Total = 0, Quantity2Total = 0;
+            foreach (DataRow row in source.Rows)
+            {
+                Quantity1Total += Convert.ToInt32(row["Quantity1"]);
+                Quantity2Total += Convert.ToInt32(row["Quantity2"]);
+            }
+
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Total.ToString());
+            summary.Add("Quantity2", Quantity2Total.ToString());
+            Grid9.SummaryData = summary;
+        }
+
+        public static DataTable ObjectToTable(object obj)
+        {
+            try
+            {
+                Type t;
+                if (obj.GetType().IsGenericType)
+                {
+                    t = obj.GetType().GetGenericTypeDefinition();
+                }
+                else
+                {
+                    t = obj.GetType();
+                }
+                if (t == typeof(List<>) ||
+                    t == typeof(IEnumerable<>))
+                {
+                    DataTable dt = new DataTable();
+                    IEnumerable<object> lstenum = obj as IEnumerable<object>;
+                    if (lstenum.Count() > 0)
+                    {
+                        var ob1 = lstenum.GetEnumerator();
+                        ob1.MoveNext();
+                        foreach (var item in ob1.Current.GetType().GetProperties())
+                        {
+                            dt.Columns.Add(new DataColumn() { ColumnName = item.Name });
+                        }
+                        //数据
+                        foreach (var item in lstenum)
+                        {
+                            DataRow row = dt.NewRow();
+                            foreach (var sub in item.GetType().GetProperties())
+                            {
+                                row[sub.Name] = sub.GetValue(item, null);
+                            }
+                            dt.Rows.Add(row);
+                        }
+                        return dt;
+                    }
+                }
+                else if (t == typeof(DataTable))
+                {
+                    return (DataTable)obj;
+                }
+                else   //(t==typeof(Object))
+                {
+                    DataTable dt = new DataTable();
+                    foreach (var item in obj.GetType().GetProperties())
+                    {
+                        dt.Columns.Add(new DataColumn() { ColumnName = item.Name });
+                    }
+                    DataRow row = dt.NewRow();
+                    foreach (var item in obj.GetType().GetProperties())
+                    {
+                        row[item.Name] = item.GetValue(obj, null);
+                    }
+                    dt.Rows.Add(row);
+                    return dt;
+                }
+
+            }
+            catch (Exception ex)
+            {
+            }
+            return null;
+        }
+
+        #endregion
+
+        #region 7.3 无损检测管理 Grid10方法
+        void loadProcessControl_NondestructiveTest_New()
+        {
+            var db = Funs.DB;
+
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.ProcessControl_NondestructiveTest_New>();
+            //加载所有施工分包单位
+            var units = from x in Funs.DB.Project_ProjectUnit
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2)
+                        orderby y.UnitCode
+                        select new { x.UnitId, y.UnitName };
+
+            int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计
+
+
+            foreach (var item in units)
+            {
+                int? num0 = 0, num1 = 0;//拍片数量小计
+
+                var query = from c in db.ProcessControl_NondestructiveTest_New
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+                            && c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
+
+                            orderby c.CreateDate descending
+
+                            select new
+
+                            {
+                                c.CreateDate,
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.ProfessionalName,
+                                c.MonthQuantity,
+                                c.TotalQuantity,
+                                c.MonthRate,
+                                c.TotalRate
+                            };
+
+                //加载工艺管道
+                var gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "工艺管道");
+                var model = new Model.ProcessControl_NondestructiveTest_New();
+                model.Id = Guid.NewGuid().ToString();
+                model.CreateMan = item.UnitName;//用作存储施工单位名称
+                model.ProfessionalName = "工艺管道";
+
+                if (gygdModel != null)
+                {
+                    model.MonthQuantity = gygdModel.MonthQuantity;
+                    model.TotalQuantity = gygdModel.TotalQuantity;
+                    model.MonthRate = gygdModel.MonthRate + "%";
+                    model.TotalRate = gygdModel.TotalRate + "%";
+                    #region 小计和合计
+                    //小计
+                    num0 += gygdModel.MonthQuantity;
+                    num1 += gygdModel.TotalQuantity;
+
+                    //合计
+                    totalNum0 += gygdModel.MonthQuantity;
+                    totalNum1 += gygdModel.TotalQuantity;
+
+                    #endregion
+                    list.Add(model);
+                }
+                else
+                {
+                    model.MonthQuantity = 0;
+                    model.TotalQuantity = 0;
+                    model.MonthRate = "0%";
+                    model.TotalRate = "0%";
+                    list.Add(model);
+                }
+
+
+
+
+                //地管
+                gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管");
+                model = new Model.ProcessControl_NondestructiveTest_New();
+                model.Id = Guid.NewGuid().ToString();
+                model.CreateMan = item.UnitName;//用作存储施工单位名称
+                model.ProfessionalName = "地管";
+
+                if (gygdModel != null)
+                {
+                    model.MonthQuantity = gygdModel.MonthQuantity;
+                    model.TotalQuantity = gygdModel.TotalQuantity;
+                    model.MonthRate = gygdModel.MonthRate + "%";
+                    model.TotalRate = gygdModel.TotalRate + "%";
+                    #region 小计和合计
+                    //小计
+                    num0 += gygdModel.MonthQuantity;
+                    num1 += gygdModel.TotalQuantity;
+
+                    //合计
+                    totalNum0 += gygdModel.MonthQuantity;
+                    totalNum1 += gygdModel.TotalQuantity;
+
+                    #endregion
+                    list.Add(model);
+                }
+                else
+                {
+                    model.MonthQuantity = 0;
+                    model.TotalQuantity = 0;
+                    model.MonthRate = "0%";
+                    model.TotalRate = "0%";
+                    list.Add(model);
+                }
+
+
+                //非标
+                gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "非标");
+                model = new Model.ProcessControl_NondestructiveTest_New();
+                model.Id = Guid.NewGuid().ToString();
+                model.CreateMan = item.UnitName;//用作存储施工单位名称
+                model.ProfessionalName = "非标";
+
+                if (gygdModel != null)
+                {
+                    model.MonthQuantity = gygdModel.MonthQuantity;
+                    model.TotalQuantity = gygdModel.TotalQuantity;
+                    model.MonthRate = gygdModel.MonthRate + "%";
+                    model.TotalRate = gygdModel.TotalRate + "%";
+                    #region 小计和合计
+                    //小计
+                    num0 += gygdModel.MonthQuantity;
+                    num1 += gygdModel.TotalQuantity;
+
+                    //合计
+                    totalNum0 += gygdModel.MonthQuantity;
+                    totalNum1 += gygdModel.TotalQuantity;
+
+                    #endregion
+                    list.Add(model);
+                }
+                else
+                {
+                    model.MonthQuantity = 0;
+                    model.TotalQuantity = 0;
+                    model.MonthRate = "0%";
+                    model.TotalRate = "0%";
+                    list.Add(model);
+                }
+                //小计
+                model = new Model.ProcessControl_NondestructiveTest_New();
+                model.Id = Guid.NewGuid().ToString();
+                model.CreateMan = item.UnitName;//用作存储施工单位名称
+                model.ProfessionalName = "小计";
+                model.MonthQuantity = num0;
+                model.TotalQuantity = num1;
+                model.MonthRate = "";
+                model.TotalRate = "";
+                list.Add(model);
+            }
+
+            Grid10.DataSource = list;
+            Grid10.DataBind();
+
+            //合计
+            //合计
+            JObject summary = new JObject();
+            summary.Add("CreateMan", "合计");
+            summary.Add("MonthQuantity", totalNum0.ToString());
+            summary.Add("TotalQuantity", totalNum1.ToString());
+
+            Grid10.SummaryData = summary;
+        }
+        #endregion
+
+        #region 8 设备报验管理情况 Grid11方法
+        /// <summary>
+        /// 加载一般施工审批情况
+        /// </summary>
+        void LoadInspectionEquipment(string objType)
+        {
+            var db = Funs.DB;
+            DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
+            DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
+            var list = new List<Model.Report_Construction_Plan>();
+            int i = 1;
+
+            int Quantity1Sum = 0;
+            int Quantity2Sum = 0;
+            //加载所有单位
+            var units = from x in Funs.DB.Project_ProjectUnit
+                        join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
+                        where x.ProjectId == this.CurrUser.LoginProjectId && (x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1)
+                        orderby y.UnitCode
+                        select new { x.UnitId, y.UnitName };
+            foreach (var item in units)
+            {
+
+                var query = from c in db.Comprehensive_InspectionEquipment
+
+                            join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
+
+                            from u in unitJoin.DefaultIfEmpty()
+
+                            where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
+
+                             && c.Status == "3"
+
+                            select new
+
+                            {
+                                c.SamplingResult,//1合格 2不合格
+                                c.ProjectId,
+                                u.UnitId,
+                                u.UnitName,
+                                c.CompileDate
+                            };
+
+                var AllList = query.ToList();
+                var monethCount = query
+                    .Where(x => (x.CompileDate >= Convert.ToDateTime(startDate) && x.CompileDate <= Convert.ToDateTime(endDate)));
+
+                Model.Report_Construction_Plan model = new Model.Report_Construction_Plan();
+
+                model.Id = Guid.NewGuid().ToString();
+                model.UnitOrMajor = item.UnitName;
+                model.Quantity1 = monethCount.Count();
+                model.Quantity2 = AllList.Count();
+                //验收合格率
+                var UnqualifiedCount = AllList.Where(x => x.SamplingResult == "1").ToList().Count;//合格的数量
+                if (UnqualifiedCount == AllList.Count() && AllList.Count() != 0)
+                {
+                    model.QuaRate = "100%";
+                }
+                else if (UnqualifiedCount == 0 && AllList.Count() == 0)
+                {
+                    model.QuaRate = "0%";
+                }
+                else
+                {
+                    var Qualificationrate = (Convert.ToDouble(UnqualifiedCount) / Convert.ToDouble(AllList.Count)) * 100;
+                    model.QuaRate = Qualificationrate.ToString("0.00") + "%";
+                }
+
+                model.ReportId = ReportId;
+                //如果是修改，查询表中数据
+                if (objType == "1")
+                {
+                    var NewModel = db.Report_Construction_Plan.FirstOrDefault(x => x.ReportId == ReportId && x.UnitOrMajor == item.UnitName && x.ReType == "6");
+                    if (NewModel != null)
+                    {
+                        model.Remarks = NewModel.Remarks;
+                    }
+                }
+                list.Add(model);
+
+                Quantity1Sum += monethCount.Count();
+                Quantity2Sum += AllList.Count();
+
+                i++;
+            }
+            Grid11.DataSource = list;
+            Grid11.DataBind();
+
+            //合计
+            JObject summary = new JObject();
+            summary.Add("UnitOrMajor", "合计");
+            summary.Add("Quantity1", Quantity1Sum.ToString());
+            summary.Add("Quantity2", Quantity2Sum.ToString());
+
+            Grid11.SummaryData = summary;
+        }
+
+        /// <summary>
+        /// 新增按钮显示文本框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAddGrid11_Click(object sender, EventArgs e)
+        {
+            Form19.Hidden = false;
+        }
+        #endregion
+
         #region 保存
         /// <summary>
         /// 保存按钮
@@ -229,12 +1323,36 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
 
             //所有文本框表
             TextBoxContentService.Delete(ReportId);
+
+            //删除施工方案及检验试验计划审批情况
+            BLL.CQMS.ManageReport.ReportNew.ConstructionPlanService.Delete(ReportId);
             #endregion
 
             #region 保存所有子表
             //保存本月质量目标管理情况
             saveTarget();
 
+            //保存3.1一般施工方案审批情况
+            saveYbsgfa();
+
+            //保存3.2危大工程方案审批情况
+            saveWdgcfa();
+
+            //保存3.2质量控制点或检验试验计划（ITP）情况
+            saveJysyjh();
+
+            //保存4 设计交底管理情况
+            saveSjjd();
+
+            //保存4图纸会审管理情况
+            saveTzhs();
+
+            //保存7.2PQR/WPS报验情况
+            savePqrWps();
+
+            //保存8 设备材料报验管理情况
+            saveSbclBy();
+
             //保存文本框
             saveTxtContent();
             #endregion
@@ -253,10 +1371,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         }
 
         #region 保存本月质量目标管理情况 
-        void saveTarget() {
+        void saveTarget()
+        {
             List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
             JArray teamGroupData = Grid1.GetMergedData();
-            foreach (JObject teamGroupRow in teamGroupData) {
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
                 JObject values = teamGroupRow.Value<JObject>("values");
                 int rowIndex = teamGroupRow.Value<int>("index");
                 Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
@@ -276,19 +1396,259 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 }
                 detailLists.Add(newDetail);
             }
-            if (detailLists.Count>0)
+            if (detailLists.Count > 0)
             {
                 Funs.DB.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
                 Funs.DB.SubmitChanges();
             }
-           
+
+        }
+        #endregion
+
+        #region 保存PQR/WPS报验情况
+        void savePqrWps()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid9.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "5",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Remarks = values.Value<string>("Remarks"),
+                };
+                if (Grid9.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid9.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
         }
         #endregion
 
+        /// <summary>
+        /// 3.1保存一般施工方案审批情况
+        /// </summary>
+        void saveYbsgfa()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid2.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "0",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid2.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid2.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 3.2保存危大工程方案审批情况
+        /// </summary>
+        void saveWdgcfa()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid3.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "1",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Quantity3 = values.Value<int>("Quantity3"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid3.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid3.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 3.3 质量控制点或检验试验计划（ITP）情况
+        /// </summary>
+        void saveJysyjh()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid4.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "2",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid4.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid4.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 保存设计交底管理情况
+        /// </summary>
+        void saveSjjd()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid5.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "3",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid5.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid5.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 保存图纸会审
+        /// </summary>
+        void saveTzhs()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid6.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "4",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid6.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid6.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 保存设备材料报验管理情况
+        /// </summary>
+        void saveSbclBy()
+        {
+            List<Model.Report_Construction_Plan> detailLists = new List<Model.Report_Construction_Plan>();
+            JArray teamGroupData = Grid11.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_Construction_Plan newDetail = new Model.Report_Construction_Plan
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ReType = "6",
+                    UnitOrMajor = values.Value<string>("UnitOrMajor"),
+                    Quantity1 = values.Value<int>("Quantity1"),
+                    Quantity2 = values.Value<int>("Quantity2"),
+                    QuaRate = values.Value<string>("QuaRate"),
+                    Remarks = values.Value<string>("Remarks")
+                };
+                if (Grid11.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid11.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_Construction_Plan.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
         /// <summary>
         /// 保存文本框内容
         /// </summary>
-        void saveTxtContent() {
+        void saveTxtContent()
+        {
             var txtContentList = new List<Model.Report_TextBoxContent>();
             #region 给实体赋值
             var model0 = new Model.Report_TextBoxContent();
@@ -332,6 +1692,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             model22.ContentType = "22";
             model22.ContentText = txtAre22.Text;
             txtContentList.Add(model22);
+
+            //如果8设备材料报验管理情况点击了增加按钮，则添加文本框内容
+            var model8 = new Model.Report_TextBoxContent();
+            model8.Id = Guid.NewGuid().ToString();
+            model8.ReportId = ReportId;
+            model8.ContentType = "8";
+            model8.ContentText = txtAre8.Text;
+            txtContentList.Add(model8);
             #endregion
             Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
             Funs.DB.SubmitChanges();
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
index 290b4f10..b621669f 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.designer.cs
@@ -156,7 +156,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtStartDate;
+        protected global::FineUIPro.DatePicker txtStartDate;
+
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
 
         /// <summary>
         /// txtEndDate 控件。
@@ -165,7 +174,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox txtEndDate;
+        protected global::FineUIPro.DatePicker txtEndDate;
 
         /// <summary>
         /// Panel4 控件。
@@ -374,6 +383,411 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// </remarks>
         protected global::FineUIPro.Form Form9;
 
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+
+        /// <summary>
+        /// TextBox5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox5;
+
+        /// <summary>
+        /// Panel11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel11;
+
+        /// <summary>
+        /// Form10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form10;
+
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+
+        /// <summary>
+        /// TextBox1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox1;
+
+        /// <summary>
+        /// Panel12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel12;
+
+        /// <summary>
+        /// Form11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form11;
+
+        /// <summary>
+        /// Grid4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid4;
+
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+
+        /// <summary>
+        /// Panel13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel13;
+
+        /// <summary>
+        /// Form12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form12;
+
+        /// <summary>
+        /// Grid5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid5;
+
+        /// <summary>
+        /// TextBox3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox3;
+
+        /// <summary>
+        /// Panel14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel14;
+
+        /// <summary>
+        /// Form13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form13;
+
+        /// <summary>
+        /// Grid6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid6;
+
+        /// <summary>
+        /// TextBox4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox4;
+
+        /// <summary>
+        /// Panel15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel15;
+
+        /// <summary>
+        /// Form14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form14;
+
+        /// <summary>
+        /// Grid7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid7;
+
+        /// <summary>
+        /// Panel16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel16;
+
+        /// <summary>
+        /// Panel17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel17;
+
+        /// <summary>
+        /// Form15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form15;
+
+        /// <summary>
+        /// Grid8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid8;
+
+        /// <summary>
+        /// Panel18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel18;
+
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// Button4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button4;
+
+        /// <summary>
+        /// Form16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form16;
+
+        /// <summary>
+        /// Grid9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid9;
+
+        /// <summary>
+        /// drpUnitIdGrid9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitIdGrid9;
+
+        /// <summary>
+        /// TextBox7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox TextBox7;
+
+        /// <summary>
+        /// TextBox8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox TextBox8;
+
+        /// <summary>
+        /// TextBox10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox10;
+
+        /// <summary>
+        /// Panel19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel19;
+
+        /// <summary>
+        /// Form17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form17;
+
+        /// <summary>
+        /// Grid10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid10;
+
+        /// <summary>
+        /// Panel20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel20;
+
+        /// <summary>
+        /// Form18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form18;
+
+        /// <summary>
+        /// Grid11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid11;
+
+        /// <summary>
+        /// TextBox6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox6;
+
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+
+        /// <summary>
+        /// Button5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button5;
+
+        /// <summary>
+        /// Form19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form19;
+
+        /// <summary>
+        /// txtAre8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre8;
+
         /// <summary>
         /// Panel3 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx
index bd551e81..54a9365a 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx
@@ -6,12 +6,381 @@
 <head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title></title>
+    <base target="_self" />
+    <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
+    
+    <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <style>
+        /*.myIframe {
+            overflow: hidden;*/ /* 隐藏滚动条 */
+            /*height: 100%;*/ /* 根据需要调整高度 */
+        /*}*/
+    </style>
+  <style>
+      .Toolbar2 {
+        position: absolute;
+        z-index: 999999;
+        right: 0;
+        width: 83px;
+        top: -43px;
+        background-color: rgba(0, 0, 0, 0);
+      }
+  </style>
 </head>
 <body>
     <form id="form1" runat="server">
-       <f:PageManager ID="PageManager1"  runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
+        <f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px"
+            ShowBorder="true" ShowHeader="false" Title="内容面板">
+
+            <table id="Table1" runat="server" width="100%" cellpadding="0" cellspacing="0" align="center">
+                <tr>
+                    <td style="width: 100%; background: url('../Images/bg-1.gif')">
+                        <table id="tabbtn" runat="server" width="100%" style="background: url('../Images/bg-1.gif')"
+                            cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
+                                    &nbsp;编辑施工质量月报
+                                </td>
+                                <td align="right" valign="middle" style="width: 50%; height: 30px;">
+                                    <%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
+                                        ValidationGroup="Save" />--%>
+
+                                    <f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                                    </f:Button>
+
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table5" runat="server" width="100%" border="1" cellpadding="0" cellspacing="0"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr>
+                                <td align="center" style="width: 24%;" rowspan="2">
+                                    <img alt="" src="../../Images/Logo.jpg" />
+                                </td>
+                                <td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
+                                    <asp:Label ID="lblProjectName" runat="server"></asp:Label>
+                                </td>
+                                <td align="left" style="width: 30%; vertical-align: bottom;" onkeypress="keypress()"
+                                    rowspan="2">
+                                    <asp:Label ID="Label1" runat="server" Text="第（"></asp:Label>
+                                    <asp:TextBox ID="txtPeriod" runat="server" Width="30px" CssClass="textboxStyleNone"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtPeriod"
+                                        Display="Dynamic" ErrorMessage="&quot;周期不能为空！&quot;" ForeColor="Red" ValidationGroup="Save">*</asp:RequiredFieldValidator>
+                                    <asp:Label ID="Label2" runat="server" Text="）期"></asp:Label>
+                                    <br />
+                                    <br />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
+                                    <asp:Label ID="lblTital" runat="server" Text="施 工 质 量 月 报"></asp:Label>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table2" runat="server" width="100%" cellpadding="0" cellspacing="0" border="1"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr style="height: 32px">
+                                <td align="right" style="width: 10%">时间段&nbsp;
+                                </td>
+                                <td align="left" style="width: 90%">
+                                    <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                        onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                        OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                    —
+                            <asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <%--<tr>
+                    <td>
+                       <table id="Table9" runat="server" width="100%" cellpadding="0" cellspacing="0">
+                            <tr style="background: url('../../Images/bg-1.gif')">
+                                <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image6" runat="server" />
+                                    &nbsp;20）项目质量体系审核
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="left" valign="middle" style="height: 50px;">
+                                    <table width="100%">
+                                        <tr>
+                                            <td>
+                                                <asp:TextBox ID="txtContent20" runat="server" TextMode="MultiLine" Rows="6" Width="90%"></asp:TextBox>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                     </td>
+                </tr>--%>
 
 
+
+            </table>
+            <%--1.本月质量目标管理情况--%>
+            <f:Panel ID="Panel4" IsFluid="true" Title="1.本月质量目标管理情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
+                ShowHeader="true">
+                <Toolbars>
+                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
+                          <Items>
+                          <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                        </f:Button>
+                              </Items>
+                     </f:Toolbar>
+                </Toolbars>
+                <Items>
+                <f:Form ID="Form5" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" >
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                                   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
+                                DataKeyNames="Id" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC" 
+                                 AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
+                                EnableTextSelection="True">
+                                <Columns>
+                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                        TextAlign="Center" />
+
+                                    <f:RenderField Width="150px" ColumnID="ProStage" DataField="ProStage"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
+                                        <Editor>
+                                            <f:TextBox ID="txtProStage" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                     <f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述">
+                                        <Editor>
+                                            <f:TextBox ID="txtProDescribe" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="100px" ColumnID="TargetValue" DataField="TargetValue"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
+                                        <Editor>
+                                            <f:TextBox ID="txtTargetValue" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
+                                        <Editor>
+                                            <f:TextBox ID="txtMonthPer" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                        <Editor>
+                                            <f:TextBox ID="txtRemarks" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+
+                                    <f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
+                                        HeaderTextAlign="Center" HeaderText="删除" />
+                                </Columns>
+                                <Listeners>
+                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                </Listeners>
+                            </f:Grid>
+                                </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--2.本月主要工作内容--%>
+            <f:Panel ID="Panel5" IsFluid="true" Title="2.本月主要工作内容" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Panel ID="Panel6" IsFluid="true" Title="2.1 设计质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form6" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel7" IsFluid="true" Title="2.2 采购质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form7" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel8" IsFluid="true" Title="2.3 施工质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form8" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+                      
+                </Items>
+            </f:Panel>
+
+             <f:Panel ID="Panel9" IsFluid="true" Title="3.施工方案及检验试验计划审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+
+                      <f:Panel ID="Panel10" IsFluid="true" Title="3.1 一般施工方案审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form9" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+
+                </Items>
+            </f:Panel>
+
+
+             <%--20.项目质量体系审核--%>
+            <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--21.类似项目管理经验教训应对措施及跟踪--%>
+            <f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--22.附件--%>
+             <f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                        </f:Button>
+
+                       
+
+                        <f:HiddenField ID="hdId" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:ContentPanel>
+        <asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;"
+            runat="server" ValidationGroup="Save" HeaderText="请注意！"
+            ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
+
+        <input runat="server" type="hidden" id="hidReportId" />
     </form>
 </body>
 </html>
+<script type="text/javascript">
+    // 返回false，来阻止浏览器右键菜单
+    function onRowContextMenu(event, rowId) {
+        //F(menuID).show();  //showAt(event.pageX, event.pageY);
+        return false;
+    }
+</script>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
index 2fe57dda..17fa9493 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
@@ -1,17 +1,344 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using BLL;
+using Newtonsoft.Json.Linq;
 
 namespace FineUIPro.Web.CQMS.ManageReportNew
 {
-    public partial class MonthReportNewEdit : System.Web.UI.Page
+    public partial class MonthReportNewEdit : PageBase
     {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ReportId
+        {
+            get
+            {
+                return (string)ViewState["ReportId"];
+            }
+            set
+            {
+                ViewState["ReportId"] = value;
+            }
+        }
+
+        public string AddOrUpdate
+        {
+            get
+            {
+                return (string)ViewState["AddOrUpdate"];
+            }
+            set
+            {
+                ViewState["AddOrUpdate"] = value;
+            }
+        }
+        #endregion
+
+        #region 列表集合
+        private static List<Model.Report_CqmsTarget> detailsGrid1 = new List<Model.Report_CqmsTarget>();
+        #endregion
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
+            if (!IsPostBack)
+            {
+                this.EnableViewState = true;
+                this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
+                this.ReportId = Request.Params["reportId"];
+                if (!string.IsNullOrEmpty(Request.Params["view"]))
+                {
+                    this.Button1.Visible = false;
+                    this.Button2.Visible = false;
+                }
+
+                if (!string.IsNullOrEmpty(this.ReportId))
+                {
+                    Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
+                    if (weekAndMonthReport != null)
+                    {
+                        if (weekAndMonthReport.SortId != null)
+                        {
+                            this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
+                        }
+                        if (weekAndMonthReport.StartDate != null)
+                        {
+                            this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
+                        }
+                        if (weekAndMonthReport.EndDate != null)
+                        {
+                            this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
+                        }
+                    }
+                    AddOrUpdate = "update";
+
+                    #region 加载本月质量目标管理情况 
+                    detailsGrid1.Clear();
+                    detailsGrid1 = (from x in Funs.DB.Report_CqmsTarget
+                                    where x.ReportId == this.ReportId
+                                    orderby x.SortId
+                                    select x).ToList();
+                    if (detailsGrid1.Count > 0)
+                    {
+                        Grid1.Hidden = false;
+                        Grid1.DataSource = detailsGrid1;
+                        Grid1.DataBind();
+                    }
+
+                    #endregion
+
+                    #region 加载文本框内容
+                    var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
+                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+
+                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    #endregion
+
+
+                }
+                else
+                {
+                    this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
+                    this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
+                    //给个新的主键
+                    ReportId = Guid.NewGuid().ToString();
+                    AddOrUpdate = "add";
+                }
+                hidReportId.Value = ReportId;
+            }
+        }
+        #endregion
+
+        #region 时间选择事件
+        /// <summary>
+        /// 开始时间选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtStartDate_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+            {
+                string url = Request.Url.ToString();
+                if (url.Contains("?"))
+                {
+                    url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?'));
+                }
+                Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text);
+            }
+        }
+        #endregion
+
+        #region 本月质量目标管理情况 Grid1方法
+        protected void btnAddGrid1_Click(object sender, EventArgs e)
+        {
+            Grid1.Hidden = false;
+
+            JArray teamGroupData = Grid1.GetMergedData();
+            List<JObject> list = new List<JObject>();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                values.Add("Id", teamGroupRow.Value<string>("id"));
+                list.Add(values);
+            }
+            JObject defaultObj = new JObject
+                {   { "Id",Guid.NewGuid() },
+                    { "ReportId", ReportId },
+                    { "ProStage", "" },
+                    { "ProDescribe",""},
+                    { "TargetValue", "" },
+                    { "MonthPer","" },
+                    { "Remarks", "" },
+                    { "SortId","" },
+                    { "Delete1", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
+                };
+            list.Add(defaultObj);
+            Grid1.DataSource = list;
+            Grid1.DataBind();
+        }
+
+        protected void Grid1_PreDataBound(object sender, EventArgs e)
+        {
+            // 设置LinkButtonField的点击客户端事件
+            LinkButtonField deleteField = Grid1.FindColumn("Delete1") as LinkButtonField;
+            deleteField.OnClientClick = GetDeleteScriptGrid1();
+        }
+        /// <summary>
+        /// 删除提示
+        /// </summary>
+        /// <returns></returns>
+        private string GetDeleteScriptGrid1()
+        {
+            return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
+            report.Id = ReportId;
+            report.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
+            {
+                try
+                {
+                    report.SortId = this.txtPeriod.Text.Trim();
+                }
+                catch (Exception)
+                {
+                    ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true);
+                    return;
+                }
+            }
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text))
+            {
+                report.StartDate = Convert.ToDateTime(this.txtStartDate.Text);
+            }
+            if (!string.IsNullOrEmpty(this.txtEndDate.Text))
+            {
+                report.EndDate = Convert.ToDateTime(this.txtEndDate.Text);
+            }
+            report.CreateDate = DateTime.Now;
+            report.CreateMan = CurrUser.UserId;
+
+            #region 删除所有子表
+            //本月质量目标管理情况 
+            CqmsTargetService.Delete(ReportId);
+
+            //所有文本框表
+            TextBoxContentService.Delete(ReportId);
+            #endregion
+
+            #region 保存所有子表
+            //保存本月质量目标管理情况
+            saveTarget();
+
+            //保存文本框
+            saveTxtContent();
+            #endregion
+
+            if (AddOrUpdate == "add")
+            {
+                WeekAndMonthReportNewService.Insert(report);
+            }
+            else
+            {
+                WeekAndMonthReportNewService.Update(report);
+            }
+
+            ShowNotify("编辑成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        #region 保存本月质量目标管理情况 
+        void saveTarget()
+        {
+            List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
+            JArray teamGroupData = Grid1.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ProStage = values.Value<string>("ProStage"),
+                    ProDescribe = values.Value<string>("ProDescribe"),
+                    TargetValue = values.Value<string>("TargetValue"),
+                    MonthPer = values.Value<string>("MonthPer"),
+                    Remarks = values.Value<string>("Remarks"),
+                    SortId = rowIndex + 1
+                };
+                if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
 
         }
+        #endregion
+
+        /// <summary>
+        /// 保存文本框内容
+        /// </summary>
+        void saveTxtContent()
+        {
+            var txtContentList = new List<Model.Report_TextBoxContent>();
+            #region 给实体赋值
+            var model0 = new Model.Report_TextBoxContent();
+            model0.Id = Guid.NewGuid().ToString();
+            model0.ReportId = ReportId;
+            model0.ContentType = "0";
+            model0.ContentText = txtAre0.Text;
+            txtContentList.Add(model0);
+
+            var model1 = new Model.Report_TextBoxContent();
+            model1.Id = Guid.NewGuid().ToString();
+            model1.ReportId = ReportId;
+            model1.ContentType = "1";
+            model1.ContentText = txtAre1.Text;
+            txtContentList.Add(model1);
+
+            var model2 = new Model.Report_TextBoxContent();
+            model2.Id = Guid.NewGuid().ToString();
+            model2.ReportId = ReportId;
+            model2.ContentType = "2";
+            model2.ContentText = txtAre2.Text;
+            txtContentList.Add(model2);
+
+            var model20 = new Model.Report_TextBoxContent();
+            model20.Id = Guid.NewGuid().ToString();
+            model20.ReportId = ReportId;
+            model20.ContentType = "20";
+            model20.ContentText = txtAre20.Text;
+            txtContentList.Add(model20);
+
+            var model21 = new Model.Report_TextBoxContent();
+            model21.Id = Guid.NewGuid().ToString();
+            model21.ReportId = ReportId;
+            model21.ContentType = "21";
+            model21.ContentText = txtAre21.Text;
+            txtContentList.Add(model21);
+
+            var model22 = new Model.Report_TextBoxContent();
+            model22.Id = Guid.NewGuid().ToString();
+            model22.ReportId = ReportId;
+            model22.ContentType = "22";
+            model22.ContentText = txtAre22.Text;
+            txtContentList.Add(model22);
+            #endregion
+            Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
+            Funs.DB.SubmitChanges();
+        }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs
index 769a7a4e..14e28359 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.designer.cs
@@ -31,5 +31,500 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// Table1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table1;
+
+        /// <summary>
+        /// tabbtn 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable tabbtn;
+
+        /// <summary>
+        /// image15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image image15;
+
+        /// <summary>
+        /// Button2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button2;
+
+        /// <summary>
+        /// Table5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table5;
+
+        /// <summary>
+        /// lblProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblProjectName;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// txtPeriod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPeriod;
+
+        /// <summary>
+        /// RequiredFieldValidator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// lblTital 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblTital;
+
+        /// <summary>
+        /// Table2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table2;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtStartDate;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtEndDate;
+
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// Button3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button3;
+
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// txtProStage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProStage;
+
+        /// <summary>
+        /// txtProDescribe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProDescribe;
+
+        /// <summary>
+        /// txtTargetValue 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTargetValue;
+
+        /// <summary>
+        /// txtMonthPer 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthPer;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarks;
+
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+
+        /// <summary>
+        /// Panel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel6;
+
+        /// <summary>
+        /// Form6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+
+        /// <summary>
+        /// txtAre0 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre0;
+
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+
+        /// <summary>
+        /// Form7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form7;
+
+        /// <summary>
+        /// txtAre1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre1;
+
+        /// <summary>
+        /// Panel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel8;
+
+        /// <summary>
+        /// Form8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form8;
+
+        /// <summary>
+        /// txtAre2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre2;
+
+        /// <summary>
+        /// Panel9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel9;
+
+        /// <summary>
+        /// Panel10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel10;
+
+        /// <summary>
+        /// Form9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form9;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// Form3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form3;
+
+        /// <summary>
+        /// txtAre20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre20;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// txtAre21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre21;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+
+        /// <summary>
+        /// txtAre22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre22;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdCheckControlCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckControlCode;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// Button1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// ValidationSummary1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+
+        /// <summary>
+        /// hidReportId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReportId;
     }
 }
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx
new file mode 100644
index 00000000..84511046
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx
@@ -0,0 +1,386 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportNewEdit1.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.MonthReportNewEdit1" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <base target="_self" />
+    <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
+    
+    <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <style>
+        /*.myIframe {
+            overflow: hidden;*/ /* 隐藏滚动条 */
+            /*height: 100%;*/ /* 根据需要调整高度 */
+        /*}*/
+    </style>
+  <style>
+      .Toolbar2 {
+        position: absolute;
+        z-index: 999999;
+        right: 0;
+        width: 83px;
+        top: -43px;
+        background-color: rgba(0, 0, 0, 0);
+      }
+  </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" />
+        <f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px"
+            ShowBorder="true" ShowHeader="false" Title="内容面板">
+
+            <table id="Table1" runat="server" width="100%" cellpadding="0" cellspacing="0" align="center">
+                <tr>
+                    <td style="width: 100%; background: url('../Images/bg-1.gif')">
+                        <table id="tabbtn" runat="server" width="100%" style="background: url('../Images/bg-1.gif')"
+                            cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
+                                    &nbsp;编辑施工质量月报
+                                </td>
+                                <td align="right" valign="middle" style="width: 50%; height: 30px;">
+                                    <%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
+                                        ValidationGroup="Save" />--%>
+
+                                    <f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                                    </f:Button>
+
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table5" runat="server" width="100%" border="1" cellpadding="0" cellspacing="0"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr>
+                                <td align="center" style="width: 24%;" rowspan="2">
+                                    <img alt="" src="../../Images/Logo.jpg" />
+                                </td>
+                                <td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
+                                    <asp:Label ID="lblProjectName" runat="server"></asp:Label>
+                                </td>
+                                <td align="left" style="width: 30%; vertical-align: bottom;" onkeypress="keypress()"
+                                    rowspan="2">
+                                    <asp:Label ID="Label1" runat="server" Text="第（"></asp:Label>
+                                    <asp:TextBox ID="txtPeriod" runat="server" Width="30px" CssClass="textboxStyleNone"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtPeriod"
+                                        Display="Dynamic" ErrorMessage="&quot;周期不能为空！&quot;" ForeColor="Red" ValidationGroup="Save">*</asp:RequiredFieldValidator>
+                                    <asp:Label ID="Label2" runat="server" Text="）期"></asp:Label>
+                                    <br />
+                                    <br />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
+                                    <asp:Label ID="lblTital" runat="server" Text="施 工 质 量 月 报"></asp:Label>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table2" runat="server" width="100%" cellpadding="0" cellspacing="0" border="1"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr style="height: 32px">
+                                <td align="right" style="width: 10%">时间段&nbsp;
+                                </td>
+                                <td align="left" style="width: 90%">
+                                    <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                        onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                        OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                    —
+                            <asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <%--<tr>
+                    <td>
+                       <table id="Table9" runat="server" width="100%" cellpadding="0" cellspacing="0">
+                            <tr style="background: url('../../Images/bg-1.gif')">
+                                <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image6" runat="server" />
+                                    &nbsp;20）项目质量体系审核
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="left" valign="middle" style="height: 50px;">
+                                    <table width="100%">
+                                        <tr>
+                                            <td>
+                                                <asp:TextBox ID="txtContent20" runat="server" TextMode="MultiLine" Rows="6" Width="90%"></asp:TextBox>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                     </td>
+                </tr>--%>
+
+
+
+            </table>
+            <%--1.本月质量目标管理情况--%>
+            <f:Panel ID="Panel4" IsFluid="true" Title="1.本月质量目标管理情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
+                ShowHeader="true">
+                <Toolbars>
+                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
+                          <Items>
+                          <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                        </f:Button>
+                              </Items>
+                     </f:Toolbar>
+                </Toolbars>
+                <Items>
+                <f:Form ID="Form5" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" >
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                                   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
+                                DataKeyNames="Id" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC" 
+                                 AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
+                                EnableTextSelection="True">
+                                <Columns>
+                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                        TextAlign="Center" />
+
+                                    <f:RenderField Width="150px" ColumnID="ProStage" DataField="ProStage"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
+                                        <Editor>
+                                            <f:TextBox ID="txtProStage" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                     <f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述">
+                                        <Editor>
+                                            <f:TextBox ID="txtProDescribe" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="100px" ColumnID="TargetValue" DataField="TargetValue"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
+                                        <Editor>
+                                            <f:TextBox ID="txtTargetValue" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
+                                        <Editor>
+                                            <f:TextBox ID="txtMonthPer" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                        <Editor>
+                                            <f:TextBox ID="txtRemarks" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+
+                                    <f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
+                                        HeaderTextAlign="Center" HeaderText="删除" />
+                                </Columns>
+                                <Listeners>
+                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                </Listeners>
+                            </f:Grid>
+                                </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--2.本月主要工作内容--%>
+            <f:Panel ID="Panel5" IsFluid="true" Title="2.本月主要工作内容" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Panel ID="Panel6" IsFluid="true" Title="2.1 设计质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form6" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel7" IsFluid="true" Title="2.2 采购质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form7" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel8" IsFluid="true" Title="2.3 施工质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form8" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+                      
+                </Items>
+            </f:Panel>
+
+             <f:Panel ID="Panel9" IsFluid="true" Title="3.施工方案及检验试验计划审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+
+                      <f:Panel ID="Panel10" IsFluid="true" Title="3.1 一般施工方案审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form9" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+
+                </Items>
+            </f:Panel>
+
+
+             <%--20.项目质量体系审核--%>
+            <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--21.类似项目管理经验教训应对措施及跟踪--%>
+            <f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--22.附件--%>
+             <f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                        </f:Button>
+
+                       
+
+                        <f:HiddenField ID="hdId" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:ContentPanel>
+        <asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;"
+            runat="server" ValidationGroup="Save" HeaderText="请注意！"
+            ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
+
+        <input runat="server" type="hidden" id="hidReportId" />
+    </form>
+</body>
+</html>
+<script type="text/javascript">
+    // 返回false，来阻止浏览器右键菜单
+    function onRowContextMenu(event, rowId) {
+        //F(menuID).show();  //showAt(event.pageX, event.pageY);
+        return false;
+    }
+</script>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.cs
new file mode 100644
index 00000000..4e6bbabd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.cs
@@ -0,0 +1,344 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+using Newtonsoft.Json.Linq;
+
+namespace FineUIPro.Web.CQMS.ManageReportNew
+{
+    public partial class MonthReportNewEdit1 : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ReportId
+        {
+            get
+            {
+                return (string)ViewState["ReportId"];
+            }
+            set
+            {
+                ViewState["ReportId"] = value;
+            }
+        }
+
+        public string AddOrUpdate
+        {
+            get
+            {
+                return (string)ViewState["AddOrUpdate"];
+            }
+            set
+            {
+                ViewState["AddOrUpdate"] = value;
+            }
+        }
+        #endregion
+
+        #region 列表集合
+        private static List<Model.Report_CqmsTarget> detailsGrid1 = new List<Model.Report_CqmsTarget>();
+        #endregion
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.EnableViewState = true;
+                this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
+                this.ReportId = Request.Params["reportId"];
+                if (!string.IsNullOrEmpty(Request.Params["view"]))
+                {
+                    this.Button1.Visible = false;
+                    this.Button2.Visible = false;
+                }
+
+                if (!string.IsNullOrEmpty(this.ReportId))
+                {
+                    Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
+                    if (weekAndMonthReport != null)
+                    {
+                        if (weekAndMonthReport.SortId != null)
+                        {
+                            this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
+                        }
+                        if (weekAndMonthReport.StartDate != null)
+                        {
+                            this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
+                        }
+                        if (weekAndMonthReport.EndDate != null)
+                        {
+                            this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
+                        }
+                    }
+                    AddOrUpdate = "update";
+
+                    #region 加载本月质量目标管理情况 
+                    detailsGrid1.Clear();
+                    detailsGrid1 = (from x in Funs.DB.Report_CqmsTarget
+                                    where x.ReportId == this.ReportId
+                                    orderby x.SortId
+                                    select x).ToList();
+                    if (detailsGrid1.Count > 0)
+                    {
+                        Grid1.Hidden = false;
+                        Grid1.DataSource = detailsGrid1;
+                        Grid1.DataBind();
+                    }
+
+                    #endregion
+
+                    #region 加载文本框内容
+                    var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
+                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+
+                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    #endregion
+
+
+                }
+                else
+                {
+                    this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
+                    this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
+                    //给个新的主键
+                    ReportId = Guid.NewGuid().ToString();
+                    AddOrUpdate = "add";
+                }
+                hidReportId.Value = ReportId;
+            }
+        }
+        #endregion
+
+        #region 时间选择事件
+        /// <summary>
+        /// 开始时间选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtStartDate_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+            {
+                string url = Request.Url.ToString();
+                if (url.Contains("?"))
+                {
+                    url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?'));
+                }
+                Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text);
+            }
+        }
+        #endregion
+
+        #region 本月质量目标管理情况 Grid1方法
+        protected void btnAddGrid1_Click(object sender, EventArgs e)
+        {
+            Grid1.Hidden = false;
+
+            JArray teamGroupData = Grid1.GetMergedData();
+            List<JObject> list = new List<JObject>();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                values.Add("Id", teamGroupRow.Value<string>("id"));
+                list.Add(values);
+            }
+            JObject defaultObj = new JObject
+                {   { "Id",Guid.NewGuid() },
+                    { "ReportId", ReportId },
+                    { "ProStage", "" },
+                    { "ProDescribe",""},
+                    { "TargetValue", "" },
+                    { "MonthPer","" },
+                    { "Remarks", "" },
+                    { "SortId","" },
+                    { "Delete1", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
+                };
+            list.Add(defaultObj);
+            Grid1.DataSource = list;
+            Grid1.DataBind();
+        }
+
+        protected void Grid1_PreDataBound(object sender, EventArgs e)
+        {
+            // 设置LinkButtonField的点击客户端事件
+            LinkButtonField deleteField = Grid1.FindColumn("Delete1") as LinkButtonField;
+            deleteField.OnClientClick = GetDeleteScriptGrid1();
+        }
+        /// <summary>
+        /// 删除提示
+        /// </summary>
+        /// <returns></returns>
+        private string GetDeleteScriptGrid1()
+        {
+            return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
+            report.Id = ReportId;
+            report.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
+            {
+                try
+                {
+                    report.SortId = this.txtPeriod.Text.Trim();
+                }
+                catch (Exception)
+                {
+                    ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true);
+                    return;
+                }
+            }
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text))
+            {
+                report.StartDate = Convert.ToDateTime(this.txtStartDate.Text);
+            }
+            if (!string.IsNullOrEmpty(this.txtEndDate.Text))
+            {
+                report.EndDate = Convert.ToDateTime(this.txtEndDate.Text);
+            }
+            report.CreateDate = DateTime.Now;
+            report.CreateMan = CurrUser.UserId;
+
+            #region 删除所有子表
+            //本月质量目标管理情况 
+            CqmsTargetService.Delete(ReportId);
+
+            //所有文本框表
+            TextBoxContentService.Delete(ReportId);
+            #endregion
+
+            #region 保存所有子表
+            //保存本月质量目标管理情况
+            saveTarget();
+
+            //保存文本框
+            saveTxtContent();
+            #endregion
+
+            if (AddOrUpdate == "add")
+            {
+                WeekAndMonthReportNewService.Insert(report);
+            }
+            else
+            {
+                WeekAndMonthReportNewService.Update(report);
+            }
+
+            ShowNotify("编辑成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        #region 保存本月质量目标管理情况 
+        void saveTarget()
+        {
+            List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
+            JArray teamGroupData = Grid1.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ProStage = values.Value<string>("ProStage"),
+                    ProDescribe = values.Value<string>("ProDescribe"),
+                    TargetValue = values.Value<string>("TargetValue"),
+                    MonthPer = values.Value<string>("MonthPer"),
+                    Remarks = values.Value<string>("Remarks"),
+                    SortId = rowIndex + 1
+                };
+                if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 保存文本框内容
+        /// </summary>
+        void saveTxtContent()
+        {
+            var txtContentList = new List<Model.Report_TextBoxContent>();
+            #region 给实体赋值
+            var model0 = new Model.Report_TextBoxContent();
+            model0.Id = Guid.NewGuid().ToString();
+            model0.ReportId = ReportId;
+            model0.ContentType = "0";
+            model0.ContentText = txtAre0.Text;
+            txtContentList.Add(model0);
+
+            var model1 = new Model.Report_TextBoxContent();
+            model1.Id = Guid.NewGuid().ToString();
+            model1.ReportId = ReportId;
+            model1.ContentType = "1";
+            model1.ContentText = txtAre1.Text;
+            txtContentList.Add(model1);
+
+            var model2 = new Model.Report_TextBoxContent();
+            model2.Id = Guid.NewGuid().ToString();
+            model2.ReportId = ReportId;
+            model2.ContentType = "2";
+            model2.ContentText = txtAre2.Text;
+            txtContentList.Add(model2);
+
+            var model20 = new Model.Report_TextBoxContent();
+            model20.Id = Guid.NewGuid().ToString();
+            model20.ReportId = ReportId;
+            model20.ContentType = "20";
+            model20.ContentText = txtAre20.Text;
+            txtContentList.Add(model20);
+
+            var model21 = new Model.Report_TextBoxContent();
+            model21.Id = Guid.NewGuid().ToString();
+            model21.ReportId = ReportId;
+            model21.ContentType = "21";
+            model21.ContentText = txtAre21.Text;
+            txtContentList.Add(model21);
+
+            var model22 = new Model.Report_TextBoxContent();
+            model22.Id = Guid.NewGuid().ToString();
+            model22.ReportId = ReportId;
+            model22.ContentType = "22";
+            model22.ContentText = txtAre22.Text;
+            txtContentList.Add(model22);
+            #endregion
+            Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
+            Funs.DB.SubmitChanges();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.designer.cs
new file mode 100644
index 00000000..f31ab9d6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit1.aspx.designer.cs
@@ -0,0 +1,530 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ManageReportNew
+{
+
+
+    public partial class MonthReportNewEdit1
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// Table1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table1;
+
+        /// <summary>
+        /// tabbtn 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable tabbtn;
+
+        /// <summary>
+        /// image15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image image15;
+
+        /// <summary>
+        /// Button2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button2;
+
+        /// <summary>
+        /// Table5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table5;
+
+        /// <summary>
+        /// lblProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblProjectName;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// txtPeriod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPeriod;
+
+        /// <summary>
+        /// RequiredFieldValidator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// lblTital 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblTital;
+
+        /// <summary>
+        /// Table2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table2;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtStartDate;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtEndDate;
+
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// Button3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button3;
+
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// txtProStage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProStage;
+
+        /// <summary>
+        /// txtProDescribe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProDescribe;
+
+        /// <summary>
+        /// txtTargetValue 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTargetValue;
+
+        /// <summary>
+        /// txtMonthPer 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthPer;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarks;
+
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+
+        /// <summary>
+        /// Panel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel6;
+
+        /// <summary>
+        /// Form6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+
+        /// <summary>
+        /// txtAre0 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre0;
+
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+
+        /// <summary>
+        /// Form7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form7;
+
+        /// <summary>
+        /// txtAre1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre1;
+
+        /// <summary>
+        /// Panel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel8;
+
+        /// <summary>
+        /// Form8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form8;
+
+        /// <summary>
+        /// txtAre2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre2;
+
+        /// <summary>
+        /// Panel9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel9;
+
+        /// <summary>
+        /// Panel10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel10;
+
+        /// <summary>
+        /// Form9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form9;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// Form3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form3;
+
+        /// <summary>
+        /// txtAre20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre20;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// txtAre21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre21;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+
+        /// <summary>
+        /// txtAre22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre22;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdCheckControlCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckControlCode;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// Button1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// ValidationSummary1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+
+        /// <summary>
+        /// hidReportId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReportId;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
new file mode 100644
index 00000000..b028e076
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
@@ -0,0 +1,386 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportNewEdit2.aspx.cs" Inherits="FineUIPro.Web.CQMS.ManageReportNew.MonthReportNewEdit2" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+    <base target="_self" />
+    <script type="text/javascript" src="../../res/index/js/jquery-3.4.1.min.js"></script>
+    
+    <script src="../../Controls/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
+    <style>
+        /*.myIframe {
+            overflow: hidden;*/ /* 隐藏滚动条 */
+            /*height: 100%;*/ /* 根据需要调整高度 */
+        /*}*/
+    </style>
+  <style>
+      .Toolbar2 {
+        position: absolute;
+        z-index: 999999;
+        right: 0;
+        width: 83px;
+        top: -43px;
+        background-color: rgba(0, 0, 0, 0);
+      }
+  </style>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" />
+        <f:ContentPanel ID="ContentPanel1" IsFluid="true" CssClass="blockpanel" runat="server" BodyPadding="10px"
+            ShowBorder="true" ShowHeader="false" Title="内容面板">
+
+            <table id="Table1" runat="server" width="100%" cellpadding="0" cellspacing="0" align="center">
+                <tr>
+                    <td style="width: 100%; background: url('../Images/bg-1.gif')">
+                        <table id="tabbtn" runat="server" width="100%" style="background: url('../Images/bg-1.gif')"
+                            cellpadding="0" cellspacing="0">
+                            <tr>
+                                <td align="left" valign="middle" style="width: 50%; font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image15" runat="server" />
+                                    &nbsp;编辑施工质量月报
+                                </td>
+                                <td align="right" valign="middle" style="width: 50%; height: 30px;">
+                                    <%-- <asp:ImageButton ID="btnSave" runat="server" ImageUrl="~/Images/savebutton.gif" OnClick="btnSave_Click" OnClientClick="demo"
+                                        ValidationGroup="Save" />--%>
+
+                                    <f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                                    </f:Button>
+
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table5" runat="server" width="100%" border="1" cellpadding="0" cellspacing="0"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr>
+                                <td align="center" style="width: 24%;" rowspan="2">
+                                    <img alt="" src="../../Images/Logo.jpg" />
+                                </td>
+                                <td align="center" style="width: 46%; height: 30px; vertical-align: middle; font-size: 12pt;">
+                                    <asp:Label ID="lblProjectName" runat="server"></asp:Label>
+                                </td>
+                                <td align="left" style="width: 30%; vertical-align: bottom;" onkeypress="keypress()"
+                                    rowspan="2">
+                                    <asp:Label ID="Label1" runat="server" Text="第（"></asp:Label>
+                                    <asp:TextBox ID="txtPeriod" runat="server" Width="30px" CssClass="textboxStyleNone"></asp:TextBox>
+                                    <asp:RequiredFieldValidator ID="RequiredFieldValidator1" runat="server" ControlToValidate="txtPeriod"
+                                        Display="Dynamic" ErrorMessage="&quot;周期不能为空！&quot;" ForeColor="Red" ValidationGroup="Save">*</asp:RequiredFieldValidator>
+                                    <asp:Label ID="Label2" runat="server" Text="）期"></asp:Label>
+                                    <br />
+                                    <br />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="center" style="width: 46%; height: 50px; vertical-align: middle; font-size: 20pt; font-weight: bold">
+                                    <asp:Label ID="lblTital" runat="server" Text="施 工 质 量 月 报"></asp:Label>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <table id="Table2" runat="server" width="100%" cellpadding="0" cellspacing="0" border="1"
+                            bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
+                            <tr style="height: 32px">
+                                <td align="right" style="width: 10%">时间段&nbsp;
+                                </td>
+                                <td align="left" style="width: 90%">
+                                    <asp:TextBox ID="txtStartDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                        onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                        OnTextChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                    —
+                            <asp:TextBox ID="txtEndDate" runat="server" class="Wdate" Style="width: 20%; cursor: hand"
+                                onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',skin:'whyGreen'})" AutoPostBack="True"
+                                OnTextChanged="txtStartDate_TextChanged" valueChanged="txtStartDate_TextChanged"></asp:TextBox>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+
+                <%--<tr>
+                    <td>
+                       <table id="Table9" runat="server" width="100%" cellpadding="0" cellspacing="0">
+                            <tr style="background: url('../../Images/bg-1.gif')">
+                                <td align="left" valign="middle" style="font-size: 12pt; font-weight: bold">
+                                    <asp:Image ImageUrl="~/Images/lv-1.gif" ImageAlign="AbsMiddle" ID="image6" runat="server" />
+                                    &nbsp;20）项目质量体系审核
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="left" valign="middle" style="height: 50px;">
+                                    <table width="100%">
+                                        <tr>
+                                            <td>
+                                                <asp:TextBox ID="txtContent20" runat="server" TextMode="MultiLine" Rows="6" Width="90%"></asp:TextBox>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                        </table>
+                     </td>
+                </tr>--%>
+
+
+
+            </table>
+            <%--1.本月质量目标管理情况--%>
+            <f:Panel ID="Panel4" IsFluid="true" Title="1.本月质量目标管理情况" runat="server" EnableCollapse="false" CssStyle="position: relative;"
+                ShowHeader="true">
+                <Toolbars>
+                     <f:Toolbar ID="Toolbar2" Position="top" ToolbarAlign="Right" runat="server" CssClass="Toolbar2">
+                          <Items>
+                          <f:Button ID="Button3" Icon="Add" runat="server" ToolTip="保存" Text="新增" OnClick="btnAddGrid1_Click">
+                        </f:Button>
+                              </Items>
+                     </f:Toolbar>
+                </Toolbars>
+                <Items>
+                <f:Form ID="Form5" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单" >
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                                   <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="Id" Hidden="true"
+                                DataKeyNames="Id" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC" 
+                                 AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
+                                EnableTextSelection="True">
+                                <Columns>
+                                    <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
+                                        TextAlign="Center" />
+
+                                    <f:RenderField Width="150px" ColumnID="ProStage" DataField="ProStage"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目阶段">
+                                        <Editor>
+                                            <f:TextBox ID="txtProStage" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                     <f:RenderField Width="250px" ColumnID="ProDescribe" DataField="ProDescribe"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="项目质量管理目标描述">
+                                        <Editor>
+                                            <f:TextBox ID="txtProDescribe" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="100px" ColumnID="TargetValue" DataField="TargetValue"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="目标值">
+                                        <Editor>
+                                            <f:TextBox ID="txtTargetValue" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="120px" ColumnID="MonthPer" DataField="MonthPer"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="本月绩效">
+                                        <Editor>
+                                            <f:TextBox ID="txtMonthPer" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+                                    <f:RenderField Width="150px" ColumnID="Remarks" DataField="Remarks"
+                                        FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="备注">
+                                        <Editor>
+                                            <f:TextBox ID="txtRemarks" runat="server">
+                                            </f:TextBox>
+                                        </Editor>
+                                    </f:RenderField>
+
+
+                                    <f:LinkButtonField ColumnID="Delete1" Width="50px" EnablePostBack="false" Icon="Delete"
+                                        HeaderTextAlign="Center" HeaderText="删除" />
+                                </Columns>
+                                <Listeners>
+                                    <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                                </Listeners>
+                            </f:Grid>
+                                </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--2.本月主要工作内容--%>
+            <f:Panel ID="Panel5" IsFluid="true" Title="2.本月主要工作内容" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                    <f:Panel ID="Panel6" IsFluid="true" Title="2.1 设计质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form6" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre0" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel7" IsFluid="true" Title="2.2 采购质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form7" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre1" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+                    <f:Panel ID="Panel8" IsFluid="true" Title="2.3 施工质量情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form8" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                           <f:TextArea runat="server" ID="txtAre2" EmptyText="请填写内容" 
+                                                AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                            </f:TextArea>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+                      
+                </Items>
+            </f:Panel>
+
+             <f:Panel ID="Panel9" IsFluid="true" Title="3.施工方案及检验试验计划审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+
+                      <f:Panel ID="Panel10" IsFluid="true" Title="3.1 一般施工方案审批情况" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                        <Items>
+                            <f:Form ID="Form9" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </Items>
+                     </f:Panel>
+
+
+                </Items>
+            </f:Panel>
+
+
+             <%--20.项目质量体系审核--%>
+            <f:Panel ID="Panel3" IsFluid="true" Title="20.项目质量体系审核" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form3" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre20" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--21.类似项目管理经验教训应对措施及跟踪--%>
+            <f:Panel ID="Panel1" IsFluid="true" Title="21.类似项目管理经验教训应对措施及跟踪" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form2" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre21" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <%--22.附件--%>
+             <f:Panel ID="Panel2" IsFluid="true" Title="22.附件" runat="server" EnableCollapse="false"
+                ShowHeader="true">
+                <Items>
+                <f:Form ID="Form4" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
+                    <Rows>
+                        <f:FormRow>
+                            <Items>
+                               <f:TextArea runat="server" ID="txtAre22" EmptyText="请填写内容" 
+                                    AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600">
+                                </f:TextArea>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+            </f:Panel>
+
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdCheckControlCode" runat="server"></f:HiddenField>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="Button1" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
+                        </f:Button>
+
+                       
+
+                        <f:HiddenField ID="hdId" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:ContentPanel>
+        <asp:ValidationSummary ID="ValidationSummary1" Style="z-index: 101; position: absolute; top: 8px; right: 824px;"
+            runat="server" ValidationGroup="Save" HeaderText="请注意！"
+            ShowSummary="False" ShowMessageBox="True"></asp:ValidationSummary>
+
+        <input runat="server" type="hidden" id="hidReportId" />
+    </form>
+</body>
+</html>
+<script type="text/javascript">
+    // 返回false，来阻止浏览器右键菜单
+    function onRowContextMenu(event, rowId) {
+        //F(menuID).show();  //showAt(event.pageX, event.pageY);
+        return false;
+    }
+</script>
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
new file mode 100644
index 00000000..7ecb85a4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
@@ -0,0 +1,344 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using BLL;
+using Newtonsoft.Json.Linq;
+
+namespace FineUIPro.Web.CQMS.ManageReportNew
+{
+    public partial class MonthReportNewEdit2 : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ReportId
+        {
+            get
+            {
+                return (string)ViewState["ReportId"];
+            }
+            set
+            {
+                ViewState["ReportId"] = value;
+            }
+        }
+
+        public string AddOrUpdate
+        {
+            get
+            {
+                return (string)ViewState["AddOrUpdate"];
+            }
+            set
+            {
+                ViewState["AddOrUpdate"] = value;
+            }
+        }
+        #endregion
+
+        #region 列表集合
+        private static List<Model.Report_CqmsTarget> detailsGrid1 = new List<Model.Report_CqmsTarget>();
+        #endregion
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.EnableViewState = true;
+                this.lblProjectName.Text = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId).ProjectName;
+                this.ReportId = Request.Params["reportId"];
+                if (!string.IsNullOrEmpty(Request.Params["view"]))
+                {
+                    this.Button1.Visible = false;
+                    this.Button2.Visible = false;
+                }
+
+                if (!string.IsNullOrEmpty(this.ReportId))
+                {
+                    Model.Report_WeekAndMonthReport_New weekAndMonthReport = WeekAndMonthReportNewService.Detail(this.ReportId);
+                    if (weekAndMonthReport != null)
+                    {
+                        if (weekAndMonthReport.SortId != null)
+                        {
+                            this.txtPeriod.Text = Convert.ToString(weekAndMonthReport.SortId);
+                        }
+                        if (weekAndMonthReport.StartDate != null)
+                        {
+                            this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.StartDate);
+                        }
+                        if (weekAndMonthReport.EndDate != null)
+                        {
+                            this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", weekAndMonthReport.EndDate);
+                        }
+                    }
+                    AddOrUpdate = "update";
+
+                    #region 加载本月质量目标管理情况 
+                    detailsGrid1.Clear();
+                    detailsGrid1 = (from x in Funs.DB.Report_CqmsTarget
+                                    where x.ReportId == this.ReportId
+                                    orderby x.SortId
+                                    select x).ToList();
+                    if (detailsGrid1.Count > 0)
+                    {
+                        Grid1.Hidden = false;
+                        Grid1.DataSource = detailsGrid1;
+                        Grid1.DataBind();
+                    }
+
+                    #endregion
+
+                    #region 加载文本框内容
+                    var txtReportList = Funs.DB.Report_TextBoxContent.Where(x => x.ReportId == ReportId).ToList();
+                    txtAre0.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
+                    txtAre1.Text = txtReportList.FirstOrDefault(x => x.ContentType == "1").ContentText;
+                    txtAre2.Text = txtReportList.FirstOrDefault(x => x.ContentType == "2").ContentText;
+
+                    txtAre20.Text = txtReportList.FirstOrDefault(x => x.ContentType == "20").ContentText;
+                    txtAre21.Text = txtReportList.FirstOrDefault(x => x.ContentType == "21").ContentText;
+                    txtAre22.Text = txtReportList.FirstOrDefault(x => x.ContentType == "22").ContentText;
+                    #endregion
+
+
+                }
+                else
+                {
+                    this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
+                    this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
+                    //给个新的主键
+                    ReportId = Guid.NewGuid().ToString();
+                    AddOrUpdate = "add";
+                }
+                hidReportId.Value = ReportId;
+            }
+        }
+        #endregion
+
+        #region 时间选择事件
+        /// <summary>
+        /// 开始时间选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void txtStartDate_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim()))
+            {
+                string url = Request.Url.ToString();
+                if (url.Contains("?"))
+                {
+                    url = Request.Url.ToString().Substring(0, Request.Url.ToString().LastIndexOf('?'));
+                }
+                Response.Redirect(url + "?startdate=" + txtStartDate.Text + "&enddate=" + txtEndDate.Text);
+            }
+        }
+        #endregion
+
+        #region 本月质量目标管理情况 Grid1方法
+        protected void btnAddGrid1_Click(object sender, EventArgs e)
+        {
+            Grid1.Hidden = false;
+
+            JArray teamGroupData = Grid1.GetMergedData();
+            List<JObject> list = new List<JObject>();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                values.Add("Id", teamGroupRow.Value<string>("id"));
+                list.Add(values);
+            }
+            JObject defaultObj = new JObject
+                {   { "Id",Guid.NewGuid() },
+                    { "ReportId", ReportId },
+                    { "ProStage", "" },
+                    { "ProDescribe",""},
+                    { "TargetValue", "" },
+                    { "MonthPer","" },
+                    { "Remarks", "" },
+                    { "SortId","" },
+                    { "Delete1", String.Format("<a href=\"javascript:;\" onclick=\"{0}\"><img src=\"{1}\"/></a>", GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) }
+                };
+            list.Add(defaultObj);
+            Grid1.DataSource = list;
+            Grid1.DataBind();
+        }
+
+        protected void Grid1_PreDataBound(object sender, EventArgs e)
+        {
+            // 设置LinkButtonField的点击客户端事件
+            LinkButtonField deleteField = Grid1.FindColumn("Delete1") as LinkButtonField;
+            deleteField.OnClientClick = GetDeleteScriptGrid1();
+        }
+        /// <summary>
+        /// 删除提示
+        /// </summary>
+        /// <returns></returns>
+        private string GetDeleteScriptGrid1()
+        {
+            return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, Grid1.GetDeleteSelectedRowsReference(), String.Empty);
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
+            report.Id = ReportId;
+            report.ProjectId = this.CurrUser.LoginProjectId;
+            if (!string.IsNullOrEmpty(this.txtPeriod.Text.Trim()))
+            {
+                try
+                {
+                    report.SortId = this.txtPeriod.Text.Trim();
+                }
+                catch (Exception)
+                {
+                    ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true);
+                    return;
+                }
+            }
+            if (!string.IsNullOrEmpty(this.txtStartDate.Text))
+            {
+                report.StartDate = Convert.ToDateTime(this.txtStartDate.Text);
+            }
+            if (!string.IsNullOrEmpty(this.txtEndDate.Text))
+            {
+                report.EndDate = Convert.ToDateTime(this.txtEndDate.Text);
+            }
+            report.CreateDate = DateTime.Now;
+            report.CreateMan = CurrUser.UserId;
+
+            #region 删除所有子表
+            //本月质量目标管理情况 
+            CqmsTargetService.Delete(ReportId);
+
+            //所有文本框表
+            TextBoxContentService.Delete(ReportId);
+            #endregion
+
+            #region 保存所有子表
+            //保存本月质量目标管理情况
+            saveTarget();
+
+            //保存文本框
+            saveTxtContent();
+            #endregion
+
+            if (AddOrUpdate == "add")
+            {
+                WeekAndMonthReportNewService.Insert(report);
+            }
+            else
+            {
+                WeekAndMonthReportNewService.Update(report);
+            }
+
+            ShowNotify("编辑成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        #region 保存本月质量目标管理情况 
+        void saveTarget()
+        {
+            List<Model.Report_CqmsTarget> detailLists = new List<Model.Report_CqmsTarget>();
+            JArray teamGroupData = Grid1.GetMergedData();
+            foreach (JObject teamGroupRow in teamGroupData)
+            {
+                JObject values = teamGroupRow.Value<JObject>("values");
+                int rowIndex = teamGroupRow.Value<int>("index");
+                Model.Report_CqmsTarget newDetail = new Model.Report_CqmsTarget
+                {
+                    //Id = values.Value<string>("Id"),
+                    ReportId = ReportId,
+                    ProStage = values.Value<string>("ProStage"),
+                    ProDescribe = values.Value<string>("ProDescribe"),
+                    TargetValue = values.Value<string>("TargetValue"),
+                    MonthPer = values.Value<string>("MonthPer"),
+                    Remarks = values.Value<string>("Remarks"),
+                    SortId = rowIndex + 1
+                };
+                if (Grid1.Rows[rowIndex].DataKeys.Length > 0)
+                {
+                    newDetail.Id = Grid1.Rows[rowIndex].DataKeys[0].ToString();
+                }
+                detailLists.Add(newDetail);
+            }
+            if (detailLists.Count > 0)
+            {
+                Funs.DB.Report_CqmsTarget.InsertAllOnSubmit(detailLists);
+                Funs.DB.SubmitChanges();
+            }
+
+        }
+        #endregion
+
+        /// <summary>
+        /// 保存文本框内容
+        /// </summary>
+        void saveTxtContent()
+        {
+            var txtContentList = new List<Model.Report_TextBoxContent>();
+            #region 给实体赋值
+            var model0 = new Model.Report_TextBoxContent();
+            model0.Id = Guid.NewGuid().ToString();
+            model0.ReportId = ReportId;
+            model0.ContentType = "0";
+            model0.ContentText = txtAre0.Text;
+            txtContentList.Add(model0);
+
+            var model1 = new Model.Report_TextBoxContent();
+            model1.Id = Guid.NewGuid().ToString();
+            model1.ReportId = ReportId;
+            model1.ContentType = "1";
+            model1.ContentText = txtAre1.Text;
+            txtContentList.Add(model1);
+
+            var model2 = new Model.Report_TextBoxContent();
+            model2.Id = Guid.NewGuid().ToString();
+            model2.ReportId = ReportId;
+            model2.ContentType = "2";
+            model2.ContentText = txtAre2.Text;
+            txtContentList.Add(model2);
+
+            var model20 = new Model.Report_TextBoxContent();
+            model20.Id = Guid.NewGuid().ToString();
+            model20.ReportId = ReportId;
+            model20.ContentType = "20";
+            model20.ContentText = txtAre20.Text;
+            txtContentList.Add(model20);
+
+            var model21 = new Model.Report_TextBoxContent();
+            model21.Id = Guid.NewGuid().ToString();
+            model21.ReportId = ReportId;
+            model21.ContentType = "21";
+            model21.ContentText = txtAre21.Text;
+            txtContentList.Add(model21);
+
+            var model22 = new Model.Report_TextBoxContent();
+            model22.Id = Guid.NewGuid().ToString();
+            model22.ReportId = ReportId;
+            model22.ContentType = "22";
+            model22.ContentText = txtAre22.Text;
+            txtContentList.Add(model22);
+            #endregion
+            Funs.DB.Report_TextBoxContent.InsertAllOnSubmit(txtContentList);
+            Funs.DB.SubmitChanges();
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs
new file mode 100644
index 00000000..9d0b60a7
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs
@@ -0,0 +1,530 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ManageReportNew
+{
+
+
+    public partial class MonthReportNewEdit2
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// ContentPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel1;
+
+        /// <summary>
+        /// Table1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table1;
+
+        /// <summary>
+        /// tabbtn 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable tabbtn;
+
+        /// <summary>
+        /// image15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Image image15;
+
+        /// <summary>
+        /// Button2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button2;
+
+        /// <summary>
+        /// Table5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table5;
+
+        /// <summary>
+        /// lblProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblProjectName;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label1;
+
+        /// <summary>
+        /// txtPeriod 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtPeriod;
+
+        /// <summary>
+        /// RequiredFieldValidator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.RequiredFieldValidator RequiredFieldValidator1;
+
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label Label2;
+
+        /// <summary>
+        /// lblTital 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblTital;
+
+        /// <summary>
+        /// Table2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlTable Table2;
+
+        /// <summary>
+        /// txtStartDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtStartDate;
+
+        /// <summary>
+        /// txtEndDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtEndDate;
+
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// Button3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button3;
+
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// txtProStage 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProStage;
+
+        /// <summary>
+        /// txtProDescribe 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProDescribe;
+
+        /// <summary>
+        /// txtTargetValue 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTargetValue;
+
+        /// <summary>
+        /// txtMonthPer 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthPer;
+
+        /// <summary>
+        /// txtRemarks 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRemarks;
+
+        /// <summary>
+        /// Panel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel5;
+
+        /// <summary>
+        /// Panel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel6;
+
+        /// <summary>
+        /// Form6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+
+        /// <summary>
+        /// txtAre0 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre0;
+
+        /// <summary>
+        /// Panel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel7;
+
+        /// <summary>
+        /// Form7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form7;
+
+        /// <summary>
+        /// txtAre1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre1;
+
+        /// <summary>
+        /// Panel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel8;
+
+        /// <summary>
+        /// Form8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form8;
+
+        /// <summary>
+        /// txtAre2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre2;
+
+        /// <summary>
+        /// Panel9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel9;
+
+        /// <summary>
+        /// Panel10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel10;
+
+        /// <summary>
+        /// Form9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form9;
+
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+
+        /// <summary>
+        /// Form3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form3;
+
+        /// <summary>
+        /// txtAre20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre20;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// txtAre21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre21;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+
+        /// <summary>
+        /// txtAre22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtAre22;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdCheckControlCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckControlCode;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// Button1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// ValidationSummary1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
+
+        /// <summary>
+        /// hidReportId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidReportId;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx
new file mode 100644
index 00000000..12a340be
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx
@@ -0,0 +1,125 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NondestructiveTest_New.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProcessControl.NondestructiveTest_New" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>无损检测管理(新)</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+            <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="无损检测管理" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="CreateDate"
+                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                              
+                                <f:DropDownList ID="drpUnit" runat="server" Label="施工单位" LabelAlign="Right" LabelWidth="110px">
+                                </f:DropDownList>
+                               
+                                <f:DatePicker runat="server" Label="日期" ID="txtStarTime" LabelAlign="Right"
+                                    LabelWidth="80px" Width="220px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
+                                    Width="110px">
+                                </f:DatePicker>
+                                <f:Button ID="btnSearch" Icon="SystemSearch"
+                                    EnablePostBack="true" runat="server" ToolTip="查询" OnClick="btnSearch_Click">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnNew" Icon="Add" EnablePostBack="true" runat="server" OnClick="btnNew_Click" ToolTip="增加" Hidden="true">
+                                </f:Button>
+                                <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
+                                    EnableAjax="false" DisableControlBeforePostBack="false">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                       
+                        <f:RenderField ColumnID="UnitName" DataField="UnitName" FieldType="String" HeaderText="施工单位" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="320px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="MonthQuantity" DataField="MonthQuantity" FieldType="String" HeaderText="本月拍片数量" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="TotalQuantity" DataField="TotalQuantity" FieldType="String" HeaderText="累计拍片数量" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="MonthRate" DataField="MonthRate" FieldType="String" HeaderText="本月一次合格率（%）" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="TotalRate" DataField="TotalRate" FieldType="String" HeaderText="累计一次合格率（%）" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="160px">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="CreateDate" DataField="CreateDate" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="创建日期" TextAlign="Center"
+                            HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>
+                        <f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
+                            <ItemTemplate>
+                                <asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink" 
+                                                 Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("Id")) %>'   ToolTip="附件查看"></asp:LinkButton>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="无损检测管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="550px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
+                </f:MenuButton>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs
new file mode 100644
index 00000000..aa28e455
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.cs
@@ -0,0 +1,245 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+    public partial class NondestructiveTest_New : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"SELECT N.*, U.UnitName "
+                            + @" FROM ProcessControl_NondestructiveTest_New AS N"
+                            + @" LEFT JOIN Base_Unit AS U ON U.UnitId = N.UnitId"
+                            + @" WHERE N.ProjectId=@projectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            
+            if (this.drpUnit.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND N.UnitId=@UnitId";
+                listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
+            }
+            
+            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            {
+                strSql += " AND N.CreateDate >= @startDate";
+                listStr.Add(new SqlParameter("@startDate", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            {
+                strSql += " AND N.CreateDate <= @endDate";
+                listStr.Add(new SqlParameter("@endDate", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.NondestructiveTestNewMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuModify.Hidden = false;
+                    this.Grid1.EnableRowDoubleClickEvent = true;
+                }
+                else
+                {
+                    this.Grid1.EnableRowDoubleClickEvent = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 增加
+        /// <summary>
+        /// 新增按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NondestructiveTest_NewEdit.aspx", "编辑 - ")));
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            btnMenuModify_Click(null, null);
+        }
+
+        /// <summary>
+        /// 右键编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("NondestructiveTest_NewEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var InspectionEquipment = BLL.NondestructiveTestNewService.Detail(rowID);
+                    if (InspectionEquipment != null)
+                    {
+                        BLL.NondestructiveTestNewService.Delete(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("无损检测管理" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = Encoding.UTF8;
+            this.Grid1.PageSize = Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml2(Grid1));
+            Response.End();
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.designer.cs
new file mode 100644
index 00000000..cdf81a9f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_New.aspx.designer.cs
@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class NondestructiveTest_New
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+
+        /// <summary>
+        /// drpUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnit;
+
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+
+        /// <summary>
+        /// btnOut 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnOut;
+
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+        /// <summary>
+        /// lbtnFileUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnMenuModify 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuModify;
+
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx
new file mode 100644
index 00000000..26175620
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx
@@ -0,0 +1,91 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NondestructiveTest_NewEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.ProcessControl.NondestructiveTest_NewEdit" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑无损检测管理</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpUnitId" runat="server" Label="施工单位" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
+                        </f:DropDownList>
+
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList ID="drpProfessionalName" runat="server" Label="专业" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
+                            <f:ListItem Text="请选择" Value="" />
+                            <f:ListItem Text="工艺管道" Value="工艺管道" />
+                            <f:ListItem Text="地管" Value="地管" />
+                            <f:ListItem Text="非标" Value="非标" />
+                        </f:DropDownList>
+
+                    </Items>
+                </f:FormRow>
+
+
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox ID="txtMonthQuantity" runat="server" Label="本月拍片数" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox ID="txtTotalQuantity" runat="server" Label="累计拍片数量" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox ID="txtMonthRate" runat="server" Label="本月一次合格率(%)" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" ></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+
+                <f:FormRow>
+                    <Items>
+                        <f:NumberBox ID="txtTotalRate" runat="server" Label="累计一次合格率(%)" Required="true" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px" ></f:NumberBox>
+                    </Items>
+                </f:FormRow>
+                 <f:FormRow>
+                    <Items>
+                        <f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                            <Items>
+                                <f:Label ID="Label1" runat="server" Label="上传附件"
+                                    LabelWidth="130px" LabelAlign="Right">
+                                </f:Label>
+                                <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Panel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+             <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1" OnClick="btnSave_Click" ToolTip="保存" Hidden="true">
+                        </f:Button>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+        </f:Form>
+         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.cs
new file mode 100644
index 00000000..e519d4f4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.cs
@@ -0,0 +1,159 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+    public partial class NondestructiveTest_NewEdit : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 主键
+        /// </summary>
+        private string Id
+        {
+            get
+            {
+                return (string)ViewState["Id"];
+            }
+            set
+            {
+                ViewState["Id"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
+                this.Id = Request.Params["Id"];
+                if (!string.IsNullOrEmpty(this.Id))
+                {
+                    var nondestructiveTest = BLL.NondestructiveTestNewService.Detail(this.Id);
+                    if (nondestructiveTest != null)
+                    {
+                        hdAttachUrl.Text = this.Id;
+                      
+                        if (!string.IsNullOrEmpty(nondestructiveTest.UnitId))
+                        {
+                            this.drpUnitId.SelectedValue = nondestructiveTest.UnitId;
+                        }
+                        
+                        if (!string.IsNullOrEmpty(nondestructiveTest.ProfessionalName))
+                        {
+                            this.drpProfessionalName.SelectedValue = nondestructiveTest.ProfessionalName;
+                        }
+                        
+                        this.txtMonthQuantity.Text = nondestructiveTest.MonthQuantity.ToString();
+                        this.txtTotalQuantity.Text = nondestructiveTest.TotalQuantity.ToString();
+                        this.txtMonthRate.Text = nondestructiveTest.MonthRate.ToString();
+                        this.txtTotalRate.Text = nondestructiveTest.TotalRate.ToString();
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 附件上传
+        protected void btnAttach_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdAttachUrl.Text))   //新增记录
+            {
+                this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.ProcessControl_NondestructiveTest));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/NondestructiveTest&menuId={1}", this.hdAttachUrl.Text, BLL.Const.NondestructiveTestNewMenuId)));
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.NondestructiveTestNewMenuId);
+            if (buttonList.Count > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            if (this.drpUnitId.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择施工单位！", MessageBoxIcon.Warning);
+                return;
+            }
+
+            if (string.IsNullOrEmpty(this.drpProfessionalName.SelectedValue))
+            {
+                Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning);
+                return;
+            }
+            var model = new Model.ProcessControl_NondestructiveTest_New();
+            model.ProjectId = this.CurrUser.LoginProjectId;
+           
+            if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+            {
+                model.UnitId = this.drpUnitId.SelectedValue;
+            }
+            model.ProfessionalName = drpProfessionalName.SelectedValue;
+            model.CreateDate = DateTime.Now;
+            model.CreateMan = CurrUser.UserId;
+            model.MonthQuantity = Convert.ToInt32(txtMonthQuantity.Text.Trim());
+            model.TotalQuantity = Convert.ToInt32(txtTotalQuantity.Text.Trim());
+            model.MonthRate = txtMonthRate.Text.Trim();
+            model.TotalRate = txtTotalRate.Text.Trim();
+
+            
+            if (string.IsNullOrEmpty(this.Id))
+            {
+               
+                if (!string.IsNullOrEmpty(hdAttachUrl.Text))
+                {
+                    model.Id = hdAttachUrl.Text;
+                }
+                else
+                {
+                    model.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
+                    hdAttachUrl.Text = model.Id;
+                }
+                BLL.NondestructiveTestNewService.Insert(model);
+            }
+            else
+            {
+                model.Id = this.Id;
+                BLL.NondestructiveTestNewService.Update(model);
+            }
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.designer.cs
new file mode 100644
index 00000000..87e63d79
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/NondestructiveTest_NewEdit.aspx.designer.cs
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.ProcessControl
+{
+
+
+    public partial class NondestructiveTest_NewEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// drpUnitId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitId;
+
+        /// <summary>
+        /// drpProfessionalName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpProfessionalName;
+
+        /// <summary>
+        /// txtMonthQuantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtMonthQuantity;
+
+        /// <summary>
+        /// txtTotalQuantity 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtTotalQuantity;
+
+        /// <summary>
+        /// txtMonthRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtMonthRate;
+
+        /// <summary>
+        /// txtTotalRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtTotalRate;
+
+        /// <summary>
+        /// Panel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel2;
+
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+
+        /// <summary>
+        /// btnAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttach;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index bfbad3f0..659d92e2 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -3011,305 +3011,167 @@ IP地址:::1
 
 
 错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select C.*,CN.ProfessionalName,C.CNPr' 需要参数 '@ProjectId'，但未提供该参数。
 错误堆栈:
-   在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:03/18/2024 11:57:36
-出错时间:03/18/2024 11:57:36
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionTestPlan.aspx.cs:行号 57
+   在 FineUIPro.Web.CQMS.Comprehensive.InspectionTestPlan.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\InspectionTestPlan.aspx.cs:行号 25
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/18/2024 17:30:10
+出错文件:http://localhost:8579/CQMS/Comprehensive/InspectionTestPlan.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:03/18/2024 17:30:10
 
 
 错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select QualityAccidentId, time, Place' 需要参数 '@ProjectId'，但未提供该参数。
 错误堆栈:
-   在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:03/18/2024 11:57:36
-出错时间:03/18/2024 11:57:36
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.Comprehensive.QualityAccident.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\QualityAccident.aspx.cs:行号 41
+   在 FineUIPro.Web.Comprehensive.QualityAccident.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\QualityAccident.aspx.cs:行号 23
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/18/2024 18:09:49
+出错文件:http://localhost:8579/CQMS/Comprehensive/QualityAccident.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:03/18/2024 18:09:49
 
 
 错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
+错误类型:HttpCompileException
+错误信息:e:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\ReviewDrawings.aspx(32): error CS1061: “ASP.cqms_comprehensive_reviewdrawings_aspx”不包含“btnImport_Click”的定义，并且找不到可接受类型为“ASP.cqms_comprehensive_reviewdrawings_aspx”的第一个参数的扩展方法“btnImport_Click”(是否缺少 using 指令或程序集引用?)
 错误堆栈:
-   在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:03/18/2024 11:57:36
-出错时间:03/18/2024 11:57:36
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:03/19/2024 09:34:00
+出错文件:http://localhost:8579/CQMS/Comprehensive/ReviewDrawings.aspx
+IP地址:::1
+
+出错时间:03/19/2024 09:34:00
 
 
 错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“DesignDrawingsId”的属性。
 错误堆栈:
-   在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:03/18/2024 11:57:36
-出错时间:03/18/2024 11:57:36
+   在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+   在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+   在 System.Web.UI.DataBinder.Eval(Object container, String expression)
+   在 System.Web.UI.TemplateControl.Eval(String expression)
+   在 ASP.cqms_comprehensive_reviewdrawings_aspx.__DataBindinglbtnFileUrl(Object sender, EventArgs e) 位置 e:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\Comprehensive\ReviewDrawings.aspx:行号 78
+   在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+   在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+   在 System.Web.UI.Control.DataBind()
+   在 System.Web.UI.Control.DataBindChildren()
+   在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+   在 System.Web.UI.Control.DataBind()
+   在 (Control )
+   在 FineUIPro.GridRow.JKAqhrYRKGjUrputGryVTdIrcyJN()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.BCddVmyfIadUytlhvgnchfKxYmAe(DataTable , Boolean )
+   在 (Grid , DataTable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings.BindGrid()
+   在 FineUIPro.Web.CQMS.Comprehensive.ReviewDrawings.Window1_Close(Object sender, WindowCloseEventArgs e)
+   在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
+   在 (Window , WindowCloseEventArgs )
+   在 FineUIPro.Window.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/19/2024 09:35:59
+出错文件:http://localhost:8579/CQMS/Comprehensive/ReviewDrawings.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:03/19/2024 09:35:59
 
 
 错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
 错误堆栈:
-   在 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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:03/18/2024 13:57:35
-出错时间:03/18/2024 13:57:35
+   在 (Object )
+   在 FineUIPro.GridRow.uwEUVXJIBfEGVvHqMvTlecFpBACr()
+   在 (GridRow )
+   在 FineUIPro.GridRow.InitTemplateContainers()
+   在 (GridRow )
+   在 FineUIPro.Grid.JKAqhrYRKGjUrputGryVTdIrcyJN(Int32 , Object )
+   在 (Grid , Int32 , Object )
+   在 FineUIPro.Grid.AYqoKqSqsgZakIKkWuWxQURnixDO(IEnumerable , Boolean )
+   在 (Grid , IEnumerable , Boolean )
+   在 FineUIPro.Grid.DataBind(Boolean keepCurrentData)
+   在 (Grid , Boolean )
+   在 FineUIPro.Grid.DataBind()
+   在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.loadDesignChangeOrder() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 705
+   在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.lodAllGrid(String objType) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 152
+   在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 113
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:03/19/2024 10:40:05
+出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReportEdit.aspx?reportId=40d1c54d-ba0b-468d-a9a7-270797565e1b
+IP地址:::1
+操作人员:JT
 
-
-错误信息开始=====>
-错误类型: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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:03/18/2024 13:57:35
-出错时间:03/18/2024 13:57:35
-
-
-错误信息开始=====>
-错误类型: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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:03/18/2024 13:57:35
-出错时间:03/18/2024 13:57:35
-
-
-错误信息开始=====>
-错误类型: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:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:03/18/2024 13:57:35
-出错时间:03/18/2024 13:57:35
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
-出错时间:03/19/2024 13:24:46
-出错时间:03/19/2024 13:24:46
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
-出错时间:03/19/2024 13:24:46
-出错时间:03/19/2024 13:24:46
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
-出错时间:03/19/2024 13:24:46
-出错时间:03/19/2024 13:24:46
-
-
-错误信息开始=====>
-错误类型: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.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
-出错时间:03/19/2024 13:24:46
-出错时间:03/19/2024 13:24:46
+出错时间:03/19/2024 10:40:05
 
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 7c094da9..a312c7e7 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -449,6 +449,8 @@
     <Content Include="CQMS\Comprehensive\InspectionPersonApprove.aspx" />
     <Content Include="CQMS\Comprehensive\InspectionPersonDataIn.aspx" />
     <Content Include="CQMS\Comprehensive\InspectionPersonEdit.aspx" />
+    <Content Include="CQMS\Comprehensive\InspectionTestPlan.aspx" />
+    <Content Include="CQMS\Comprehensive\InspectionTestPlanEdit.aspx" />
     <Content Include="CQMS\Comprehensive\MajorPlanApproval.aspx" />
     <Content Include="CQMS\Comprehensive\MajorPlanApprovalEdit.aspx" />
     <Content Include="CQMS\Comprehensive\NCRManagement.aspx" />
@@ -462,6 +464,8 @@
     <Content Include="CQMS\Comprehensive\QualityAccident.aspx" />
     <Content Include="CQMS\Comprehensive\QualityAccidentApprove.aspx" />
     <Content Include="CQMS\Comprehensive\QualityAccidentEdit.aspx" />
+    <Content Include="CQMS\Comprehensive\ReviewDrawings.aspx" />
+    <Content Include="CQMS\Comprehensive\ReviewDrawingsEdit.aspx" />
     <Content Include="CQMS\Comprehensive\SiteVisaManagement.aspx" />
     <Content Include="CQMS\Comprehensive\SiteVisaManagementApprove.aspx" />
     <Content Include="CQMS\Comprehensive\SiteVisaManagementDataIn.aspx" />
@@ -498,6 +502,8 @@
     <Content Include="CQMS\ManageReportNew\MonthReport.aspx" />
     <Content Include="CQMS\ManageReportNew\MonthReportEdit.aspx" />
     <Content Include="CQMS\ManageReportNew\MonthReportNewEdit.aspx" />
+    <Content Include="CQMS\ManageReportNew\MonthReportNewEdit1.aspx" />
+    <Content Include="CQMS\ManageReportNew\MonthReportNewEdit2.aspx" />
     <Content Include="CQMS\ManageReport\CheckStatisc.aspx" />
     <Content Include="CQMS\ManageReport\DesignChangeStatisc.aspx" />
     <Content Include="CQMS\ManageReport\HJGLStatisc.aspx" />
@@ -532,6 +538,8 @@
     <Content Include="CQMS\ProcessControl\InspectionNoticeEdit.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTest.aspx" />
     <Content Include="CQMS\ProcessControl\NondestructiveTestEdit.aspx" />
+    <Content Include="CQMS\ProcessControl\NondestructiveTest_New.aspx" />
+    <Content Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx" />
     <Content Include="CQMS\ProcessControl\ShowUnitWork.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagement.aspx" />
     <Content Include="CQMS\ProcessControl\TestPackageManagementEdit.aspx" />
@@ -1755,6 +1763,9 @@
     <Content Include="TestRun\DriverReport\LinkedTestRunReportEdit.aspx" />
     <Content Include="TestRun\DriverReport\MonthReport.aspx" />
     <Content Include="TestRun\DriverReport\MonthReportEdit.aspx" />
+    <Content Include="TestRun\DriverReport\MonthReportPush.aspx" />
+    <Content Include="TestRun\DriverReport\MonthReportPushView.aspx" />
+    <Content Include="TestRun\DriverReport\MonthReportView.aspx" />
     <Content Include="TestRun\DriverReport\PropertyReport.aspx" />
     <Content Include="TestRun\DriverReport\PropertyReportEdit.aspx" />
     <Content Include="TestRun\DriverReport\WeekReport.aspx" />
@@ -7454,6 +7465,20 @@
     <Compile Include="CQMS\Comprehensive\InspectionPersonEdit.aspx.designer.cs">
       <DependentUpon>InspectionPersonEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\Comprehensive\InspectionTestPlan.aspx.cs">
+      <DependentUpon>InspectionTestPlan.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\InspectionTestPlan.aspx.designer.cs">
+      <DependentUpon>InspectionTestPlan.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\InspectionTestPlanEdit.aspx.cs">
+      <DependentUpon>InspectionTestPlanEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\InspectionTestPlanEdit.aspx.designer.cs">
+      <DependentUpon>InspectionTestPlanEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\Comprehensive\MajorPlanApproval.aspx.cs">
       <DependentUpon>MajorPlanApproval.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -7545,6 +7570,20 @@
     <Compile Include="CQMS\Comprehensive\QualityAccidentEdit.aspx.designer.cs">
       <DependentUpon>QualityAccidentEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\Comprehensive\ReviewDrawings.aspx.cs">
+      <DependentUpon>ReviewDrawings.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\ReviewDrawings.aspx.designer.cs">
+      <DependentUpon>ReviewDrawings.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\ReviewDrawingsEdit.aspx.cs">
+      <DependentUpon>ReviewDrawingsEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\Comprehensive\ReviewDrawingsEdit.aspx.designer.cs">
+      <DependentUpon>ReviewDrawingsEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\Comprehensive\SiteVisaManagement.aspx.cs">
       <DependentUpon>SiteVisaManagement.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -7797,6 +7836,20 @@
     <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit.aspx.designer.cs">
       <DependentUpon>MonthReportNewEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit1.aspx.cs">
+      <DependentUpon>MonthReportNewEdit1.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit1.aspx.designer.cs">
+      <DependentUpon>MonthReportNewEdit1.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit2.aspx.cs">
+      <DependentUpon>MonthReportNewEdit2.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ManageReportNew\MonthReportNewEdit2.aspx.designer.cs">
+      <DependentUpon>MonthReportNewEdit2.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\ManageReport\CheckStatisc.aspx.cs">
       <DependentUpon>CheckStatisc.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8035,6 +8088,20 @@
     <Compile Include="CQMS\ProcessControl\NondestructiveTestEdit.aspx.designer.cs">
       <DependentUpon>NondestructiveTestEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="CQMS\ProcessControl\NondestructiveTest_New.aspx.cs">
+      <DependentUpon>NondestructiveTest_New.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\NondestructiveTest_New.aspx.designer.cs">
+      <DependentUpon>NondestructiveTest_New.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx.cs">
+      <DependentUpon>NondestructiveTest_NewEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\ProcessControl\NondestructiveTest_NewEdit.aspx.designer.cs">
+      <DependentUpon>NondestructiveTest_NewEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="CQMS\ProcessControl\ShowUnitWork.aspx.cs">
       <DependentUpon>ShowUnitWork.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15857,6 +15924,27 @@
     <Compile Include="TestRun\DriverReport\MonthReportEdit.aspx.designer.cs">
       <DependentUpon>MonthReportEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportPush.aspx.cs">
+      <DependentUpon>MonthReportPush.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportPush.aspx.designer.cs">
+      <DependentUpon>MonthReportPush.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportPushView.aspx.cs">
+      <DependentUpon>MonthReportPushView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportPushView.aspx.designer.cs">
+      <DependentUpon>MonthReportPushView.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportView.aspx.cs">
+      <DependentUpon>MonthReportView.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverReport\MonthReportView.aspx.designer.cs">
+      <DependentUpon>MonthReportView.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\DriverReport\PropertyReport.aspx.cs">
       <DependentUpon>PropertyReport.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx
index dcae9ce4..6a74db1b 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx
@@ -20,7 +20,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
                                 <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,24 +38,24 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
+                        <%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
                             FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="DriverReporName" DataField="DriverReporName"
                             FieldType="String" HeaderText="报告名称" HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="CompilePersonName" DataField="CompilePersonName"
                             FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交时间" HeaderTextAlign="Center" Width="110px">
+                            FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Number" DataField="Number"
+                        <%--<f:RenderField ColumnID="Number" DataField="Number"
                             FieldType="String" HeaderText="期数" HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs
index 3969424c..48ade239 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("DriverRunCompleteEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='6'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND report.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
+            //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND report.UnitWorkId=@unitWorkId";
+            //    listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
+            //}
             if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim()))
             {
                 strSql += " AND report.DriverReporName LIKE @DriverReporName";
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs
index 94e5f912..0a88ffa2 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// drpUnitWorkId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
         /// <summary>
         /// txtDriverReporName 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx
index d1e2fa6f..d0ba34b9 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx
@@ -34,20 +34,20 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
@@ -59,15 +59,15 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtNumber" runat="server" Label="期数" LabelAlign="Right" LabelWidth="150px" MaxLength="50">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs
index bb010c35..4ec5d6eb 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
 
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
@@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
+                        //if (!string.IsNullOrEmpty(data.UnitWorkId))
+                        //{
+                        //    this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
+                        //}
                         this.txtDriverReportCode.Text = data.DriverReportCode;
                         this.txtDriverReporName.Text = data.DriverReporName;
                         this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson);
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
-                        this.txtNumber.Text = data.Number;
+                        //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
                     }
                 }
@@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             string id = Request.Params["id"];
             Model.Driver_DriverReport newData = new Model.Driver_DriverReport();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
+            //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            //}
             newData.DriverReportCode = this.txtDriverReportCode.Text.Trim();
             newData.DriverReporName = this.txtDriverReporName.Text.Trim();
             newData.CompilePerson = this.CurrUser.UserId;
             newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
-            newData.Number = this.txtNumber.Text.Trim();
+            //newData.Number = this.txtNumber.Text.Trim();
             newData.Remark = this.txtRemark.Text.Trim();
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs
index 95b6a167..e296de19 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtDriverReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtDriverReportCode;
         
         /// <summary>
         /// txtDriverReporName 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.TextBox txtDriverReporName;
         
-        /// <summary>
-        /// txtDriverReportCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReportCode;
-        
         /// <summary>
         /// txtCompilePerson 控件。
         /// </summary>
@@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtSubmitDate;
         
-        /// <summary>
-        /// txtNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtNumber;
-        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx
index e8dd7197..e6e45728 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx
@@ -20,7 +20,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
                                 <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,24 +38,24 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
+                        <%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
                             FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="DriverReporName" DataField="DriverReporName"
                             FieldType="String" HeaderText="报告名称" HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="CompilePersonName" DataField="CompilePersonName"
                             FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交时间" HeaderTextAlign="Center" Width="110px">
+                            FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Number" DataField="Number"
+                        <%--<f:RenderField ColumnID="Number" DataField="Number"
                             FieldType="String" HeaderText="期数" HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs
index dc54e1e8..e35bc09e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("FeedTestRunReportEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='4'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND report.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
+            //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND report.UnitWorkId=@unitWorkId";
+            //    listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
+            //}
             if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim()))
             {
                 strSql += " AND report.DriverReporName LIKE @DriverReporName";
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs
index 8370f4e7..e34356d3 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// drpUnitWorkId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
         /// <summary>
         /// txtDriverReporName 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx
index 828e7c5f..cd4c1143 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx
@@ -34,20 +34,20 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
@@ -59,15 +59,15 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtNumber" runat="server" Label="期数" LabelAlign="Right" LabelWidth="150px" MaxLength="50">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs
index 32f094b0..7b21d546 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
 
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
@@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
+                        //if (!string.IsNullOrEmpty(data.UnitWorkId))
+                        //{
+                        //    this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
+                        //}
                         this.txtDriverReportCode.Text = data.DriverReportCode;
                         this.txtDriverReporName.Text = data.DriverReporName;
                         this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson);
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
-                        this.txtNumber.Text = data.Number;
+                        //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
                     }
                 }
@@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             string id = Request.Params["id"];
             Model.Driver_DriverReport newData = new Model.Driver_DriverReport();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
+            //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            //}
             newData.DriverReportCode = this.txtDriverReportCode.Text.Trim();
             newData.DriverReporName = this.txtDriverReporName.Text.Trim();
             newData.CompilePerson = this.CurrUser.UserId;
             newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
-            newData.Number = this.txtNumber.Text.Trim();
+            //newData.Number = this.txtNumber.Text.Trim();
             newData.Remark = this.txtRemark.Text.Trim();
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs
index d1d97836..634ab547 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtDriverReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtDriverReportCode;
         
         /// <summary>
         /// txtDriverReporName 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.TextBox txtDriverReporName;
         
-        /// <summary>
-        /// txtDriverReportCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReportCode;
-        
         /// <summary>
         /// txtCompilePerson 控件。
         /// </summary>
@@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtSubmitDate;
         
-        /// <summary>
-        /// txtNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtNumber;
-        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx
index 706a75ce..a918884d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx
@@ -20,7 +20,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
                                 <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,24 +38,24 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
+                        <%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
                             FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="DriverReporName" DataField="DriverReporName"
                             FieldType="String" HeaderText="报告名称" HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="CompilePersonName" DataField="CompilePersonName"
                             FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交时间" HeaderTextAlign="Center" Width="110px">
+                            FieldType="Date" Renderer="Date" HeaderText="编制日期" HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Number" DataField="Number"
+                        <%--<f:RenderField ColumnID="Number" DataField="Number"
                             FieldType="String" HeaderText="期数" HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs
index 23f4debb..367bc904 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("LinkedTestRunReportEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='3'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND report.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
+            //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND report.UnitWorkId=@unitWorkId";
+            //    listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
+            //}
             if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim()))
             {
                 strSql += " AND report.DriverReporName LIKE @DriverReporName";
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs
index 3069c926..9b5513f2 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// drpUnitWorkId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
         /// <summary>
         /// txtDriverReporName 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx
index 4d2d9006..6a835253 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx
@@ -34,20 +34,20 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
@@ -59,15 +59,15 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtNumber" runat="server" Label="期数" LabelAlign="Right" LabelWidth="150px" MaxLength="50">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs
index 6b84a5ff..c915e665 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
 
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
@@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
+                        //if (!string.IsNullOrEmpty(data.UnitWorkId))
+                        //{
+                        //    this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
+                        //}
                         this.txtDriverReportCode.Text = data.DriverReportCode;
                         this.txtDriverReporName.Text = data.DriverReporName;
                         this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson);
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
-                        this.txtNumber.Text = data.Number;
+                        //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
                     }
                 }
@@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             string id = Request.Params["id"];
             Model.Driver_DriverReport newData = new Model.Driver_DriverReport();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
+            //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            //}
             newData.DriverReportCode = this.txtDriverReportCode.Text.Trim();
             newData.DriverReporName = this.txtDriverReporName.Text.Trim();
             newData.CompilePerson = this.CurrUser.UserId;
             newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
-            newData.Number = this.txtNumber.Text.Trim();
+            //newData.Number = this.txtNumber.Text.Trim();
             newData.Remark = this.txtRemark.Text.Trim();
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs
index a6cee6b5..ad70ab29 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtDriverReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtDriverReportCode;
         
         /// <summary>
         /// txtDriverReporName 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.TextBox txtDriverReporName;
         
-        /// <summary>
-        /// txtDriverReportCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReportCode;
-        
         /// <summary>
         /// txtCompilePerson 控件。
         /// </summary>
@@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtSubmitDate;
         
-        /// <summary>
-        /// txtNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtNumber;
-        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx
index c87fb073..c7c3cad1 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx
@@ -14,14 +14,13 @@
             ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车月报告" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DriverReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverReportId" AllowSorting="true" SortField="DriverReportCode"
-                    SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    runat="server" BoxFlex="1" DataKeyNames="MonthReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true" SortField="MonthReportDate"
+                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableRowDoubleClickEvent="true" EnableTextSelection="True" OnRowCommand="Grid1_RowCommand" OnRowDoubleClick="Grid1_RowDoubleClick">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
-                                <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox ID="txtMonthReportCode" runat="server" Label="编号" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
                                 </f:Button>
@@ -38,27 +37,16 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
-                            FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="DriverReporName" DataField="DriverReporName"
-                            FieldType="String" HeaderText="报告名称" HeaderTextAlign="Center" Width="280px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="CompilePersonName" DataField="CompilePersonName"
-                            FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交时间" HeaderTextAlign="Center" Width="110px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Number" DataField="Number"
-                            FieldType="String" HeaderText="期数" HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Remark" DataField="Remark"
-                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
+                        <f:RenderField ColumnID="MonthReportCode" DataField="MonthReportCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="220px">
                         </f:RenderField>
+                        <f:RenderField ColumnID="MonthReportDate" DataField="MonthReportDate"
+                            FieldType="String" HeaderText="报告期" HeaderTextAlign="Center" Width="280px">
+                        </f:RenderField>      
+                        <f:LinkButtonField HeaderText="推送" ConfirmTarget="Top" Width="80px" CommandName="Push" ColumnID="Push"
+                            TextAlign="Center" ToolTip="推送提醒" Icon="CartPut" />                             
+                        <f:LinkButtonField HeaderText="查看推送内容" ConfirmTarget="Top" Width="120px" CommandName="SeePush" ColumnID="SeePush"
+                            TextAlign="Center" ToolTip="查看推送内容" Icon="Find" />
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
                             TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
@@ -83,7 +71,11 @@
         </f:Panel>
         <f:Window ID="Window1" Title="开车月报告" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="800px" Height="530px">
+            Width="1200px" Height="650px">
+        </f:Window>
+        <f:Window ID="Window2" Title="推送人员" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@@ -96,6 +88,8 @@
                 <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
                     OnClick="btnMenuDel_Click">
                 </f:MenuButton>
+                 <f:MenuButton ID="btnMenuView" EnablePostBack="true" runat="server" Text="查看" Icon="Find" OnClick="btnMenuView_Click">
+                </f:MenuButton>
             </Items>
         </f:Menu>
     </form>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs
index 715b2e8e..384ce137 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs
@@ -17,7 +17,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("MonthReportEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -26,38 +25,23 @@ namespace FineUIPro.Web.TestRun.DriverReport
         //加载列表
         public void BindGrid()
         {
-            string strSql = @"SELECT report.DriverReportId, 
-                                     report.DriverReportCode, 
-                                     report.DriverReporName, 
+            string strSql = @"SELECT report.MonthReportId, 
                                      report.ProjectId, 
-                                     report.UnitWorkId, 
-                                     report.CompilePerson, 
-                                     report.SubmitDate, 
-                                     report.Number, 
-                                     report.ReportType, 
-                                     report.Remark,
-                                     unitWork.UnitWorkName,
-                                     u.UserName AS CompilePersonName"
-                            + @" FROM Driver_DriverReport AS report "
-                            + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = report.UnitWorkId"
-                            + @" LEFT JOIN Sys_User AS u ON u.UserId = report.CompilePerson"
-                            + @" WHERE report.ProjectId=@projectId AND report.ReportType='2'";
+                                     report.MonthReportCode, 
+                                     (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate"
+                            + @" FROM TestRun_MonthReport AS report "
+                            + @" WHERE report.ProjectId=@projectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+
+            if (!string.IsNullOrEmpty(this.txtMonthReportCode.Text.Trim()))
             {
-                strSql += " AND report.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
-            if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim()))
-            {
-                strSql += " AND report.DriverReporName LIKE @DriverReporName";
-                listStr.Add(new SqlParameter("@DriverReporName", "%" + this.txtDriverReporName.Text.Trim() + "%"));
+                strSql += " AND report.MonthReportCode LIKE @monthReportCode";
+                listStr.Add(new SqlParameter("@monthReportCode", "%" + this.txtMonthReportCode.Text.Trim() + "%"));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
-            //tb = GetFilteredTable(Grid1.FilteredData, tb);
             var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
@@ -157,10 +141,12 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var info = BLL.DriverReportService.GetDriverReportById(rowID);
+                    var info = BLL.TestRun_MonthReportService.GetMonthReportById(rowID);
                     if (info != null)
                     {
-                        BLL.DriverReportService.DeleteDriverReport(rowID);
+                        BLL.TestRun_MonthReportItem2Service.DeleteMonthReportItem2ByReportId(rowID);
+                        BLL.TestRun_MonthReportItemService.DeleteMonthReportItemByMonthReportId(rowID);
+                        BLL.TestRun_MonthReportService.DeleteMonthReportById(rowID);
                     }
                 }
                 BindGrid();
@@ -182,6 +168,34 @@ namespace FineUIPro.Web.TestRun.DriverReport
             {
                 PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", id, BLL.Const.MonthReportMenuId)));
             }
+            else if (e.CommandName == "Push")//推送提醒
+            {
+                PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("MonthReportPush.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+            }
+            else if (e.CommandName == "SeePush")//查看推送内容
+            {
+                var report = BLL.TestRun_MonthReportService.GetMonthReportById(id);
+                if (report != null)
+                {
+                    if (!string.IsNullOrEmpty(report.PushPerson))
+                    {
+                        if (report.PushPerson.Contains(this.CurrUser.UserId))
+                        {
+                            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportPushView.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+                        }
+                        else
+                        {
+                            Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("对不起，您不是接收推送人员，不能查看！");
+                        return;
+                    }
+                }
+            }
         }
         #endregion
 
@@ -210,5 +224,22 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
         }
         #endregion
+
+        #region 查看
+        /// <summary>
+        /// 查看
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuView_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MonthReportView.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs
index d7655cb2..edfc0c9e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.designer.cs
@@ -58,22 +58,13 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Toolbar ToolSearch;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtMonthReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
-        /// <summary>
-        /// txtDriverReporName 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReporName;
+        protected global::FineUIPro.TextBox txtMonthReportCode;
         
         /// <summary>
         /// btnSearch 控件。
@@ -138,6 +129,15 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Window Window1;
         
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,5 +173,14 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuDel;
+        
+        /// <summary>
+        /// btnMenuView 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuView;
     }
 }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx
index 9f05a373..96d4ec73 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx
@@ -4,8 +4,8 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>编辑开车月报告</title>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -36,42 +36,577 @@
                                 <Rows>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
-                                        </Items>
-                                    </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtMonthReportCode" runat="server" Label="编号" LabelAlign="Right" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
+                                            <f:DatePicker ID="txtMonthReportDate" runat="server" Label="报告日期" LabelAlign="Right" Required="true" ShowRedStar="true"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
-                                            </f:TextBox>
+                                            <f:GroupPanel ID="GroupPanel1" Layout="Anchor" Title="1 项目概况" runat="server" >
+                                                <Items>
+                                                    <f:Form ID="Form3" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label1" runat="server" Text="1.1 项目名称、项目简称、用户名称、项目号"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectOverview" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label2" runat="server" Text="1.2 项目基本情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectBaseInfo" runat="server" MaxLength="2000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label3" runat="server" Text="1.3 工程装置"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtEngineeringPlant" runat="server" MaxLength="2000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label4" runat="server" Text="1.4 项目合同"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectContract" runat="server" MaxLength="2000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtCompilePerson" runat="server" Label="编制人" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Readonly="true">
-                                            </f:TextBox>
+                                            <f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="2 本月开车进展情况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form4" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label5" runat="server" Text="2.1 本月开车达到的主要控制点或里程碑点"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtMilestone" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label6" runat="server" Text="2.2 本月完成的开车主要活动/工作"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtCompleteWork" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label7" runat="server" Text="2.3 上月存在问题的解决情况以及进展"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProblemSituation" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="3 开车绩效测量" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form5" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label8" runat="server" Text="3.1 工作包完成情况统计"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="3.1 工作包完成情况统计" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItemId" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItemId"
+                                                                        EnableTextSelection="True" OnRowCommand="Grid1_RowCommand">
+                                                                        <Toolbars>
+                                                                            <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                                                                                <Items>
+                                                                                    <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                                                                    <f:Button ID="btnNew" Icon="Add" runat="server" ToolTip="新增" ValidateForms="SimpleForm1"
+                                                                                        OnClick="btnNew_Click">
+                                                                                    </f:Button>
+                                                                                </Items>
+                                                                            </f:Toolbar>
+                                                                        </Toolbars>
+                                                                        <Columns>
+                                                                            <f:RenderField ColumnID="SortIndex" DataField="SortIndex"
+                                                                                FieldType="String" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Right" Width="90px">
+                                                                                <Editor>
+                                                                                    <f:TextBox ID="txtSortIndex" runat="server"></f:TextBox>
+                                                                                </Editor>
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="WorkPackageType" DataField="WorkPackageType"
+                                                                                FieldType="String" HeaderText="类型" HeaderTextAlign="Center" Width="200px">
+                                                                                <Editor>
+                                                                                    <f:TextBox ID="txtWorkPackageType" runat="server"></f:TextBox>
+                                                                                </Editor>
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="Unit" DataField="Unit"
+                                                                                FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                                <Editor>
+                                                                                    <f:TextBox ID="txtUnit" runat="server"></f:TextBox>
+                                                                                </Editor>
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="DesignCount" DataField="DesignCount"
+                                                                                FieldType="String" HeaderText="设计数量" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                                <Editor>
+                                                                                    <f:NumberBox ID="txtDesignCount" runat="server"></f:NumberBox>
+                                                                                </Editor>
+                                                                            </f:RenderField>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="本月" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="MonthPlan" DataField="MonthPlan"
+                                                                                        FieldType="String" HeaderText="计划完成" HeaderTextAlign="Center" Width="100px">
+                                                                                        <Editor>
+                                                                                            <f:NumberBox ID="txtMonthPlan" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="MonthActual" DataField="MonthActual"
+                                                                                        FieldType="String" HeaderText="实际完成" HeaderTextAlign="Center" Width="100px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtMonthActual" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                            <f:GroupField ColumnID="GroupField2" HeaderText="累计" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TotalPlan" DataField="TotalPlan"
+                                                                                        FieldType="String" HeaderText="计划完成" HeaderTextAlign="Center" Width="100px">
+                                                                                        <Editor>
+                                                                                            <f:NumberBox ID="txtTotalPlan" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="TatalActual" DataField="TatalActual"
+                                                                                        FieldType="String" HeaderText="实际完成" HeaderTextAlign="Center" Width="100px">
+                                                                                        <Editor>
+                                                                                            <f:NumberBox ID="txtTatalActual" runat="server" NoDecimal="true" NoNegative="true"></f:NumberBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                            <f:RenderField ColumnID="CompletionRate" DataField="CompletionRate"
+                                                                                FieldType="String" HeaderText="总完成率" HeaderTextAlign="Center" Width="100px">
+                                                                                <Editor>
+                                                                                    <f:TextBox ID="txtCompletionRate" runat="server"></f:TextBox>
+                                                                                </Editor>
+                                                                            </f:RenderField>
+                                                                            <f:LinkButtonField Width="40px" ConfirmText="删除选中行？" ConfirmTarget="Parent" CommandName="Delete"
+                                                                                ToolTip="删除" Icon="Delete" TextAlign="Center" />
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label9" runat="server" Text="3.2 开车绩效测量数据"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="3.2 开车绩效测量数据（本月）" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItem2Id" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItem2Id"
+                                                                        EnableTextSelection="True" SortField="SortIndex">
+                                                                        <Columns>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="本月" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TypeName" DataField="TypeName"
+                                                                                        FieldType="String" HeaderText="" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtTypeName" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="PV" DataField="PV"
+                                                                                        FieldType="String" HeaderText="PV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtPV" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="EV" DataField="EV"
+                                                                                        FieldType="String" HeaderText="EV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtEV" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="AC" DataField="AC"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtAC" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CV" DataField="CV"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtCV" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SV" DataField="SV"
+                                                                                        FieldType="String" HeaderText="SV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtSV" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CPI" DataField="CPI"
+                                                                                        FieldType="String" HeaderText="CPI" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtCPI" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SPI" DataField="SPI"
+                                                                                        FieldType="String" HeaderText="SPI" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtSPI" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SortIndex" DataField="SortIndex"
+                                                                                        FieldType="String" HeaderText="SortIndex" HeaderTextAlign="Center" Width="120px" Hidden="true">
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="3.2 开车绩效测量数据（本月）" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItem2Id" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItem2Id"
+                                                                        EnableTextSelection="True" SortField="SortIndex">
+                                                                        <Columns>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="累计" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TypeName" DataField="TypeName"
+                                                                                        FieldType="String" HeaderText="" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtTypeName2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="PV" DataField="PV"
+                                                                                        FieldType="String" HeaderText="PV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtPV2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="EV" DataField="EV"
+                                                                                        FieldType="String" HeaderText="EV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtEV2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="AC" DataField="AC"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtAC2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CV" DataField="CV"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtCV2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SV" DataField="SV"
+                                                                                        FieldType="String" HeaderText="SV" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtSV2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CPI" DataField="CPI"
+                                                                                        FieldType="String" HeaderText="CPI" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtCPI2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SPI" DataField="SPI"
+                                                                                        FieldType="String" HeaderText="SPI" HeaderTextAlign="Center" Width="120px">
+                                                                                        <Editor>
+                                                                                            <f:TextBox ID="txtSPI2" runat="server"></f:TextBox>
+                                                                                        </Editor>
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label10" runat="server" Text="（根据赢得值原理，对开车进行进度、费用综合检测，给出上表中本月的和累计的开车绩效测量数据，这些数据的定义如下）"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label11" runat="server" Text="（1）计划值PV（也称为计划工作预算成本BCWS）"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label12" runat="server" Text="（2）实际成本AC(也称为已完成工作的实际成本ACWP)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label13" runat="server" Text="（3）赢得值EV(也称为挣值或已完成工作的预算成本BCWP)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label14" runat="server" Text="（4）成本偏差CV (CV=EV-AC)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label15" runat="server" Text="（5）成本偏差率CVR (CVR=CV/Ev x 100%)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label16" runat="server" Text="（6）进度偏差SV (SV=EV-PV)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label17" runat="server" Text="（7）进度偏差率SVR (SVR=SV/PV x 100%)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label18" runat="server" Text="（8）成本绩效指数CPI (CPI=EV/AC)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label19" runat="server" Text="（9）进度绩效指数 SPI (SPI = EV/PV)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label20" runat="server" Text="3.3 开车费用预算值、实际值"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:GroupPanel ID="GroupPanel4" Layout="Anchor" Title="预算值" runat="server">
+                                                                        <Items>
+                                                                            <f:Form ID="Form6" runat="server" ShowHeader="false" ShowBorder="false">
+                                                                                <Rows>
+                                                                                    <f:FormRow>
+                                                                                        <Items>
+                                                                                            <f:NumberBox ID="txtBudget" runat="server" Label="本月" LabelAlign="Right" NoNegative="true"></f:NumberBox>
+                                                                                            <f:NumberBox ID="txtBudgetTotal" runat="server" Label="累计" LabelAlign="Right" NoNegative="true"></f:NumberBox>
+                                                                                        </Items>
+                                                                                    </f:FormRow>
+                                                                                </Rows>
+                                                                            </f:Form>
+                                                                        </Items>
+                                                                    </f:GroupPanel>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="实际值" runat="server">
+                                                                        <Items>
+                                                                            <f:Form ID="Form7" runat="server" ShowHeader="false" ShowBorder="false">
+                                                                                <Rows>
+                                                                                    <f:FormRow>
+                                                                                        <Items>
+                                                                                            <f:NumberBox ID="txtActualCost" runat="server" Label="本月" LabelAlign="Right" NoNegative="true"></f:NumberBox>
+                                                                                            <f:NumberBox ID="txtActualCostTotal" runat="server" Label="累计" LabelAlign="Right" NoNegative="true"></f:NumberBox>
+                                                                                        </Items>
+                                                                                    </f:FormRow>
+                                                                                </Rows>
+                                                                            </f:Form>
+
+                                                                        </Items>
+                                                                    </f:GroupPanel>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtNumber" runat="server" Label="期数" LabelAlign="Right" LabelWidth="150px" MaxLength="50">
-                                            </f:TextBox>
+                                            <f:GroupPanel ID="GroupPanel6" Layout="Anchor" Title="4 项目变更说明" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form8" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label21" runat="server" Text="4.1 本月开车内部变更和外部变更发表情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtPublicationStatus" runat="server" MaxLength="500">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label22" runat="server" Text="4.2 本月开车内部变更和外部变更实施情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtImplementationStatus" runat="server" MaxLength="500">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
-                                            </f:TextArea>
+                                            <f:GroupPanel ID="GroupPanel7" Layout="Anchor" Title="5 HSE管理情况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form9" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtHSEManageSituation" runat="server" MaxLength="500">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel8" Layout="Anchor" Title="6 下月开车计划要点" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form10" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label112" runat="server" Text="6.1 下月开车应达到的主要控制点或里程碑点。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthMilestone" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label23" runat="server" Text="6.2 下月应完成的开车主要活动。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthCompleteWork" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label24" runat="server" Text="6.3 下月新的基准进度计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthSchedule" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label25" runat="server" Text="6.4 下月主要开车用款计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthDrivingCost" runat="server" MaxLength="1000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel9" Layout="Anchor" Title="7 存在的主要问题及改进措施" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form11" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label26" runat="server" Text="7.1 开车目前存在的主要问题及改进措施"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProblemsMeasures" runat="server" MaxLength="2000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label27" runat="server" Text="7.2 需要项目经理、项目主管、相关部门以及用户解决的问题。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtSolvedProblems" runat="server" MaxLength="2000">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow runat="server">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs
index bcc18fd2..269f3232 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs
@@ -1,11 +1,25 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
+using System.Collections.Generic;
 
 namespace FineUIPro.Web.TestRun.DriverReport
 {
     public partial class MonthReportEdit : PageBase
     {
-        #region 加载
+        #region 定义集合
+        /// <summary>
+        /// 工作包完成情况统计
+        /// </summary>
+        public static List<Model.TestRun_MonthReportItem> monthReportItems = new List<Model.TestRun_MonthReportItem>();
+
+        /// <summary>
+        /// 开车绩效测量数据
+        /// </summary>
+        public static List<Model.TestRun_MonthReportItem2> monthReportItems2 = new List<Model.TestRun_MonthReportItem2>();
+        #endregion
+
+        #region 页面加载
         /// <summary>
         /// 页面加载
         /// </summary>
@@ -15,32 +29,96 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
-
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
                 {
-                    Model.Driver_DriverReport data = BLL.DriverReportService.GetDriverReportById(id);
+                    Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id);
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
-                        this.txtDriverReportCode.Text = data.DriverReportCode;
-                        this.txtDriverReporName.Text = data.DriverReporName;
-                        this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson);
-                        this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
-                        this.txtNumber.Text = data.Number;
-                        this.txtRemark.Text = data.Remark;
+                        this.txtMonthReportCode.Text = data.MonthReportCode;
+                        this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : "";
+                        this.txtProjectOverview.Text = data.ProjectOverview;
+                        this.txtProjectBaseInfo.Text = data.ProjectBaseInfo;
+                        this.txtEngineeringPlant.Text = data.EngineeringPlant;
+                        this.txtProjectContract.Text = data.ProjectContract;
+                        this.txtMilestone.Text = data.Milestone;
+                        this.txtCompleteWork.Text = data.CompleteWork;
+                        this.txtProblemSituation.Text = data.ProblemSituation;
+                        this.txtBudget.Text = data.Budget.HasValue ? data.Budget.ToString() : "";
+                        this.txtBudgetTotal.Text = data.BudgetTotal.HasValue ? data.BudgetTotal.ToString() : "";
+                        this.txtActualCost.Text = data.ActualCost.HasValue ? data.ActualCost.ToString() : "";
+                        this.txtActualCostTotal.Text = data.ActualCostTotal.HasValue ? data.ActualCostTotal.ToString() : "";
+                        this.txtPublicationStatus.Text = data.PublicationStatus;
+                        this.txtImplementationStatus.Text = data.ImplementationStatus;
+                        this.txtHSEManageSituation.Text = data.HSEManageSituation;
+                        this.txtNextMonthMilestone.Text = data.NextMonthMilestone;
+                        this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork;
+                        this.txtNextMonthSchedule.Text = data.NextMonthSchedule;
+                        this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost;
+                        this.txtProblemsMeasures.Text = data.ProblemsMeasures;
+                        this.txtSolvedProblems.Text = data.SolvedProblems;
+                    }
+
+                    var items = BLL.TestRun_MonthReportItemService.GetMonthReportItemByReportId(this.hdId.Text);
+                    if (items.Count > 0)
+                    {
+                        this.Grid1.DataSource = items;
+                        this.Grid1.DataBind();
+                    }
+
+                    var items2 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "1");
+                    if (items2.Count > 0)
+                    {
+                        this.Grid2.DataSource = items2;
+                        this.Grid2.DataBind();
+                    }
+
+                    var items3 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "2");
+                    if (items3.Count > 0)
+                    {
+                        this.Grid3.DataSource = items3;
+                        this.Grid3.DataBind();
                     }
                 }
                 else
                 {
-                    this.txtCompilePerson.Text = this.CurrUser.UserName;
-                    this.txtSubmitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                    this.txtMonthReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+
+                    #region 开车绩效测量数据
+                    Model.TestRun_MonthReportItem2 newItem = new Model.TestRun_MonthReportItem2();
+                    newItem.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
+                    newItem.TypeName = "设计";
+                    monthReportItems2.Add(newItem);
+
+                    Model.TestRun_MonthReportItem2 newItem2 = new Model.TestRun_MonthReportItem2();
+                    newItem2.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
+                    newItem2.TypeName = "采购";
+                    monthReportItems2.Add(newItem2);
+
+                    Model.TestRun_MonthReportItem2 newItem3 = new Model.TestRun_MonthReportItem2();
+                    newItem3.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
+                    newItem3.TypeName = "施工";
+                    monthReportItems2.Add(newItem3);
+
+                    Model.TestRun_MonthReportItem2 newItem4 = new Model.TestRun_MonthReportItem2();
+                    newItem4.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
+                    newItem4.TypeName = "开车";
+                    monthReportItems2.Add(newItem4);
+
+                    Model.TestRun_MonthReportItem2 newItem5 = new Model.TestRun_MonthReportItem2();
+                    newItem5.MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2));
+                    newItem5.TypeName = "项目";
+                    monthReportItems2.Add(newItem5);
+
+                    this.Grid2.DataSource = monthReportItems2;
+                    this.Grid2.DataBind();
+
+                    this.Grid3.DataSource = monthReportItems2;
+                    this.Grid3.DataBind();
+                    #endregion
                 }
+                GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)";
             }
         }
         #endregion
@@ -55,7 +133,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
             {
-                this.hdId.Text = SQLHelper.GetNewID(typeof(Model.Driver_DriverReport));
+                this.hdId.Text = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReport));
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId)));
         }
@@ -70,40 +148,200 @@ namespace FineUIPro.Web.TestRun.DriverReport
         protected void btnSave_Click(object sender, EventArgs e)
         {
             string id = Request.Params["id"];
-            Model.Driver_DriverReport newData = new Model.Driver_DriverReport();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
-            newData.DriverReportCode = this.txtDriverReportCode.Text.Trim();
-            newData.DriverReporName = this.txtDriverReporName.Text.Trim();
-            newData.CompilePerson = this.CurrUser.UserId;
-            newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
-            newData.Number = this.txtNumber.Text.Trim();
-            newData.Remark = this.txtRemark.Text.Trim();
+            Model.TestRun_MonthReport newData = new Model.TestRun_MonthReport();            
+            newData.MonthReportCode = this.txtMonthReportCode.Text.Trim();
+            newData.MonthReportDate = Funs.GetNewDateTime(this.txtMonthReportDate.Text.Trim());           
             newData.ProjectId = this.CurrUser.LoginProjectId;
+            newData.ProjectOverview = this.txtProjectOverview.Text.Trim();
+            newData.ProjectBaseInfo = this.txtProjectBaseInfo.Text.Trim();
+            newData.EngineeringPlant = this.txtEngineeringPlant.Text.Trim();
+            newData.ProjectContract = this.txtProjectContract.Text.Trim();
+            newData.Milestone = this.txtMilestone.Text.Trim();
+            newData.CompleteWork = this.txtCompleteWork.Text.Trim();
+            newData.ProblemSituation = this.txtProblemSituation.Text.Trim();
+            newData.Budget = Funs.GetNewDecimal(this.txtBudget.Text.Trim());
+            newData.BudgetTotal = Funs.GetNewDecimal(this.txtBudgetTotal.Text.Trim());
+            newData.ActualCost = Funs.GetNewDecimal(this.txtActualCost.Text.Trim());
+            newData.ActualCostTotal = Funs.GetNewDecimal(this.txtActualCostTotal.Text.Trim());
+            newData.PublicationStatus = this.txtPublicationStatus.Text.Trim();
+            newData.ImplementationStatus = this.txtImplementationStatus.Text.Trim();
+            newData.HSEManageSituation = this.txtHSEManageSituation.Text.Trim();
+            newData.NextMonthMilestone = this.txtNextMonthMilestone.Text.Trim();
+            newData.NextMonthCompleteWork = this.txtNextMonthCompleteWork.Text.Trim();
+            newData.NextMonthSchedule = this.txtNextMonthSchedule.Text.Trim();
+            newData.NextMonthDrivingCost = this.txtNextMonthDrivingCost.Text.Trim();
+            newData.ProblemsMeasures = this.txtProblemsMeasures.Text.Trim();
+            newData.SolvedProblems = this.txtSolvedProblems.Text.Trim();
+
             if (!string.IsNullOrEmpty(id))
             {
-                newData.DriverReportId = id;
-                BLL.DriverReportService.UpdateDriverReport(newData);
+                newData.MonthReportId = id;
+                BLL.TestRun_MonthReportService.UpdateMonthReport(newData);
             }
             else
             {
-                newData.ReportType = "2";
                 if (!string.IsNullOrEmpty(this.hdId.Text))
                 {
-                    newData.DriverReportId = this.hdId.Text.Trim();
+                    newData.MonthReportId = this.hdId.Text.Trim();
                 }
                 else
                 {
-                    newData.DriverReportId = SQLHelper.GetNewID(typeof(Model.Driver_DriverReport));
-                    this.hdId.Text = newData.DriverReportId;
+                    newData.MonthReportId = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReport));
+                    this.hdId.Text = newData.MonthReportId;
                 }
-                BLL.DriverReportService.AddDriverReport(newData);
+                BLL.TestRun_MonthReportService.AddMonthReport(newData);
             }
+            #region 工作包完成情况统计
+            BLL.TestRun_MonthReportItemService.DeleteMonthReportItemByMonthReportId(this.hdId.Text);
+            jerqueSaveList();
+            foreach (var item in monthReportItems)
+            {
+                item.MonthReportId = this.hdId.Text;
+                BLL.TestRun_MonthReportItemService.AddMonthReportItem(item);
+            }
+            #endregion
+            #region 开车绩效测量数据
+            BLL.TestRun_MonthReportItem2Service.DeleteMonthReportItem2ByReportId(this.hdId.Text);
+            jerqueSaveList2();
+            foreach (var item in monthReportItems2)
+            {
+                item.MonthReportId = this.hdId.Text;
+                BLL.TestRun_MonthReportItem2Service.AddMonthReportItem2(item);
+            }
+            #endregion
             ShowNotify("保存成功！", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
+
+        /// <summary>
+        /// 保存工作包完成情况统计
+        /// </summary>
+        private void jerqueSaveList()
+        {
+            monthReportItems.Clear();
+            JArray mergedData = Grid1.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                Model.TestRun_MonthReportItem item = new Model.TestRun_MonthReportItem
+                {
+                    MonthReportItemId = this.Grid1.Rows[i].DataKeys[0].ToString(),
+                    SortIndex = values.Value<string>("SortIndex").ToString(),
+                    WorkPackageType = values.Value<string>("WorkPackageType").ToString(),
+                    Unit = values.Value<string>("Unit").ToString(),
+                    DesignCount = Funs.GetNewInt(values.Value<string>("DesignCount").ToString()),
+                    MonthPlan = Funs.GetNewInt(values.Value<string>("MonthPlan").ToString()),
+                    MonthActual = values.Value<string>("MonthActual").ToString(),
+                    TotalPlan = Funs.GetNewInt(values.Value<string>("TotalPlan").ToString()),
+                    TatalActual = Funs.GetNewInt(values.Value<string>("TatalActual").ToString()),
+                    CompletionRate = values.Value<string>("CompletionRate").ToString(),
+                };
+                monthReportItems.Add(item);
+            }
+        }
+
+        /// <summary>
+        /// 保存开车绩效测量数据
+        /// </summary>
+        private void jerqueSaveList2()
+        {
+            monthReportItems2.Clear();
+            int index = 1;
+            JArray mergedData = Grid2.GetMergedData();
+            foreach (JObject mergedRow in mergedData)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+
+                Model.TestRun_MonthReportItem2 item = new Model.TestRun_MonthReportItem2
+                {
+                    MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)),
+                    ReportType = "1",
+                    TypeName = values.Value<string>("TypeName").ToString(),
+                    PV = values.Value<string>("PV").ToString(),
+                    EV = values.Value<string>("EV").ToString(),
+                    AC = values.Value<string>("AC").ToString(),
+                    CV = values.Value<string>("CV").ToString(),
+                    SV = values.Value<string>("SV").ToString(),
+                    CPI = values.Value<string>("CPI").ToString(),
+                    SPI = values.Value<string>("SPI").ToString(),
+                    SortIndex = index++,
+                };
+                monthReportItems2.Add(item);
+            }
+            int index2 = 1;
+            JArray mergedData2 = Grid3.GetMergedData();
+            foreach (JObject mergedRow in mergedData2)
+            {
+                string status = mergedRow.Value<string>("status");
+                JObject values = mergedRow.Value<JObject>("values");
+                int i = mergedRow.Value<int>("index");
+                Model.TestRun_MonthReportItem2 item = new Model.TestRun_MonthReportItem2
+                {
+                    MonthReportItem2Id = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem2)),
+                    ReportType = "2",
+                    TypeName = values.Value<string>("TypeName").ToString(),
+                    PV = values.Value<string>("PV").ToString(),
+                    EV = values.Value<string>("EV").ToString(),
+                    AC = values.Value<string>("AC").ToString(),
+                    CV = values.Value<string>("CV").ToString(),
+                    SV = values.Value<string>("SV").ToString(),
+                    CPI = values.Value<string>("CPI").ToString(),
+                    SPI = values.Value<string>("SPI").ToString(),
+                    SortIndex = index2++,
+                };
+                monthReportItems2.Add(item);
+            }
+        }
+        #endregion
+
+        #region 增行按钮
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            jerqueSaveList();
+            Model.TestRun_MonthReportItem newItem = new Model.TestRun_MonthReportItem
+            {
+                MonthReportItemId = SQLHelper.GetNewID(typeof(Model.TestRun_MonthReportItem))
+            };
+            monthReportItems.Add(newItem);
+            this.Grid1.DataSource = monthReportItems;
+            this.Grid1.DataBind();
+        }
+        #endregion
+
+        #region 行事件
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        {
+            jerqueSaveList();
+            string rowID = this.Grid1.DataKeys[e.RowIndex][0].ToString();
+            if (e.CommandName == "Delete")
+            {
+                foreach (var item in monthReportItems)
+                {
+                    if (item.MonthReportItemId == rowID)
+                    {
+                        monthReportItems.Remove(item);
+                        break;
+                    }
+                }
+                Grid1.DataSource = monthReportItems;
+                Grid1.DataBind();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs
index c00cffd9..6c1c58da 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs
@@ -103,67 +103,886 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtMonthReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtMonthReportCode;
         
         /// <summary>
-        /// txtDriverReporName 控件。
+        /// txtMonthReportDate 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReporName;
+        protected global::FineUIPro.DatePicker txtMonthReportDate;
         
         /// <summary>
-        /// txtDriverReportCode 控件。
+        /// GroupPanel1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReportCode;
+        protected global::FineUIPro.GroupPanel GroupPanel1;
         
         /// <summary>
-        /// txtCompilePerson 控件。
+        /// Form3 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtCompilePerson;
+        protected global::FineUIPro.Form Form3;
         
         /// <summary>
-        /// txtSubmitDate 控件。
+        /// Label1 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtSubmitDate;
+        protected global::FineUIPro.Label Label1;
         
         /// <summary>
-        /// txtNumber 控件。
+        /// txtProjectOverview 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtNumber;
+        protected global::FineUIPro.TextArea txtProjectOverview;
         
         /// <summary>
-        /// txtRemark 控件。
+        /// Label2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextArea txtRemark;
+        protected global::FineUIPro.Label Label2;
+        
+        /// <summary>
+        /// txtProjectBaseInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectBaseInfo;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEngineeringPlant 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtEngineeringPlant;
+        
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label4;
+        
+        /// <summary>
+        /// txtProjectContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectContract;
+        
+        /// <summary>
+        /// GroupPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel2;
+        
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label5;
+        
+        /// <summary>
+        /// txtMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtMilestone;
+        
+        /// <summary>
+        /// Label6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label6;
+        
+        /// <summary>
+        /// txtCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtCompleteWork;
+        
+        /// <summary>
+        /// Label7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label7;
+        
+        /// <summary>
+        /// txtProblemSituation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProblemSituation;
+        
+        /// <summary>
+        /// GroupPanel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel3;
+        
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+        
+        /// <summary>
+        /// Label8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label8;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// txtSortIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSortIndex;
+        
+        /// <summary>
+        /// txtWorkPackageType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWorkPackageType;
+        
+        /// <summary>
+        /// txtUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUnit;
+        
+        /// <summary>
+        /// txtDesignCount 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtDesignCount;
+        
+        /// <summary>
+        /// txtMonthPlan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtMonthPlan;
+        
+        /// <summary>
+        /// txtMonthActual 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthActual;
+        
+        /// <summary>
+        /// txtTotalPlan 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtTotalPlan;
+        
+        /// <summary>
+        /// txtTatalActual 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtTatalActual;
+        
+        /// <summary>
+        /// txtCompletionRate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCompletionRate;
+        
+        /// <summary>
+        /// Label9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label9;
+        
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+        
+        /// <summary>
+        /// txtTypeName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTypeName;
+        
+        /// <summary>
+        /// txtPV 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPV;
+        
+        /// <summary>
+        /// txtEV 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEV;
+        
+        /// <summary>
+        /// txtAC 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAC;
+        
+        /// <summary>
+        /// txtCV 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCV;
+        
+        /// <summary>
+        /// txtSV 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSV;
+        
+        /// <summary>
+        /// txtCPI 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCPI;
+        
+        /// <summary>
+        /// txtSPI 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSPI;
+        
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+        
+        /// <summary>
+        /// txtTypeName2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTypeName2;
+        
+        /// <summary>
+        /// txtPV2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPV2;
+        
+        /// <summary>
+        /// txtEV2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEV2;
+        
+        /// <summary>
+        /// txtAC2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtAC2;
+        
+        /// <summary>
+        /// txtCV2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCV2;
+        
+        /// <summary>
+        /// txtSV2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSV2;
+        
+        /// <summary>
+        /// txtCPI2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCPI2;
+        
+        /// <summary>
+        /// txtSPI2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSPI2;
+        
+        /// <summary>
+        /// Label10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label10;
+        
+        /// <summary>
+        /// Label11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label11;
+        
+        /// <summary>
+        /// Label12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label12;
+        
+        /// <summary>
+        /// Label13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label13;
+        
+        /// <summary>
+        /// Label14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label14;
+        
+        /// <summary>
+        /// Label15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label15;
+        
+        /// <summary>
+        /// Label16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label16;
+        
+        /// <summary>
+        /// Label17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label17;
+        
+        /// <summary>
+        /// Label18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label18;
+        
+        /// <summary>
+        /// Label19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label19;
+        
+        /// <summary>
+        /// Label20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label20;
+        
+        /// <summary>
+        /// GroupPanel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel4;
+        
+        /// <summary>
+        /// Form6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+        
+        /// <summary>
+        /// txtBudget 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtBudget;
+        
+        /// <summary>
+        /// txtBudgetTotal 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtBudgetTotal;
+        
+        /// <summary>
+        /// GroupPanel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel5;
+        
+        /// <summary>
+        /// Form7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form7;
+        
+        /// <summary>
+        /// txtActualCost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtActualCost;
+        
+        /// <summary>
+        /// txtActualCostTotal 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtActualCostTotal;
+        
+        /// <summary>
+        /// GroupPanel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel6;
+        
+        /// <summary>
+        /// Form8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form8;
+        
+        /// <summary>
+        /// Label21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label21;
+        
+        /// <summary>
+        /// txtPublicationStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtPublicationStatus;
+        
+        /// <summary>
+        /// Label22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label22;
+        
+        /// <summary>
+        /// txtImplementationStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtImplementationStatus;
+        
+        /// <summary>
+        /// GroupPanel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel7;
+        
+        /// <summary>
+        /// Form9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form9;
+        
+        /// <summary>
+        /// txtHSEManageSituation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtHSEManageSituation;
+        
+        /// <summary>
+        /// GroupPanel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel8;
+        
+        /// <summary>
+        /// Form10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form10;
+        
+        /// <summary>
+        /// Label112 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label112;
+        
+        /// <summary>
+        /// txtNextMonthMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthMilestone;
+        
+        /// <summary>
+        /// Label23 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label23;
+        
+        /// <summary>
+        /// txtNextMonthCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthCompleteWork;
+        
+        /// <summary>
+        /// Label24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label24;
+        
+        /// <summary>
+        /// txtNextMonthSchedule 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthSchedule;
+        
+        /// <summary>
+        /// Label25 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label25;
+        
+        /// <summary>
+        /// txtNextMonthDrivingCost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthDrivingCost;
+        
+        /// <summary>
+        /// GroupPanel9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel9;
+        
+        /// <summary>
+        /// Form11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form11;
+        
+        /// <summary>
+        /// Label26 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label26;
+        
+        /// <summary>
+        /// txtProblemsMeasures 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProblemsMeasures;
+        
+        /// <summary>
+        /// Label27 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label27;
+        
+        /// <summary>
+        /// txtSolvedProblems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtSolvedProblems;
         
         /// <summary>
         /// Panel3 控件。
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx
new file mode 100644
index 00000000..ac2cfdf6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx
@@ -0,0 +1,52 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportPush.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportPush" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>月报推送给相关人员</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSubmit" OnClick="btnSubmit_Click" Icon="SystemSaveNew" runat="server" ToolTip="提交" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:Tree ID="tvPerson" EnableCollapse="true" ShowHeader="false" Title="推送人员" EnableCheckBox="true"
+                                                AutoLeafIdentification="true" runat="server" EnableIcons="true" AutoScroll="true"
+                                                EnableSingleClickExpand="true" OnNodeCheck="tvPerson_NodeCheck">
+                                            </f:Tree>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs
new file mode 100644
index 00000000..452c7f75
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.cs
@@ -0,0 +1,158 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.TestRun.DriverReport
+{
+    public partial class MonthReportPush : PageBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string id = Request.Params["id"];
+                if (!string.IsNullOrEmpty(id))
+                {
+                    this.hdId.Text = id;
+                }
+                InitMenuTree();
+            }
+        }
+
+        #region 初始化树
+        /// <summary>
+        /// 初始化树
+        /// </summary>
+        /// <param name="menuList">单位集合</param>
+        private void InitMenuTree()
+        {
+            this.tvPerson.Nodes.Clear();
+            var units = BLL.UnitService.GetUnitByProjectIdList(this.CurrUser.LoginProjectId);
+            foreach (var item in units)
+            {
+                TreeNode rootNode = new TreeNode
+                {
+                    Text = item.UnitName,
+                    NodeID = item.UnitId,
+                    EnableCheckBox = true,
+                    EnableCheckEvent = true,
+                    Expanded = true
+                };
+                this.tvPerson.Nodes.Add(rootNode);
+                this.BoundTree(rootNode.Nodes, rootNode.NodeID);
+            }
+        }
+
+        /// <summary>
+        /// 遍历增加子节点
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="menuId"></param>
+        private void BoundTree(TreeNodeCollection nodes, string superMenuId)
+        {
+            var menus = BLL.UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, superMenuId);
+            foreach (var item in menus)
+            {
+                TreeNode chidNode = new TreeNode
+                {
+                    Text = item.Text,
+                    NodeID = item.Value,
+                    EnableCheckBox = true,
+                    EnableCheckEvent = true
+                };
+                var monthReport = BLL.TestRun_MonthReportService.GetMonthReportById(this.hdId.Text.Trim());
+                if (monthReport != null)
+                {
+                    if (!string.IsNullOrEmpty(monthReport.PushPerson))
+                    {
+                        if (monthReport.PushPerson.Contains(item.Value))
+                        {
+                            chidNode.Checked = true;
+                            chidNode.Expanded = true;
+                            chidNode.Selectable = true;
+                        }
+                    }
+                }
+                nodes.Add(chidNode);
+            }
+        }
+        #endregion
+
+        #region 全选、全不选
+        /// <summary>
+        /// 全选、全不选
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvPerson_NodeCheck(object sender, FineUIPro.TreeCheckEventArgs e)
+        {
+            if (e.Checked)
+            {
+                this.tvPerson.CheckAllNodes(e.Node.Nodes);
+                SetCheckParentNode(e.Node);
+            }
+            else
+            {
+                this.tvPerson.UncheckAllNodes(e.Node.Nodes);
+            }
+        }
+
+        /// <summary>
+        /// 选中父节点
+        /// </summary>
+        /// <param name="node"></param>
+        private void SetCheckParentNode(TreeNode node)
+        {
+            if (node.ParentNode != null && node.ParentNode.NodeID != "0")
+            {
+                node.ParentNode.Checked = true;
+                if (node.ParentNode.ParentNode.NodeID != "0")
+                {
+                    SetCheckParentNode(node.ParentNode);
+                }
+            }
+        }
+        #endregion
+
+        #region 提交推送人员
+        /// <summary>
+        /// 提交推送人员
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSubmit_Click(object sender, EventArgs e)
+        {
+            #region 保存推送人员
+            string users = string.Empty;
+            TreeNode[] nodes = this.tvPerson.GetCheckedNodes();
+            if (nodes.Length > 0)
+            {
+                foreach (TreeNode tn in nodes)
+                {
+                    if (tn.NodeID != "0")
+                    {
+                        users += tn.NodeID + ",";
+                    }
+                }
+                if (!string.IsNullOrEmpty(users))
+                {
+                    users = users.Substring(0, users.LastIndexOf(','));
+                }
+                var monthReport = BLL.TestRun_MonthReportService.GetMonthReportById(this.hdId.Text.Trim());
+                if (monthReport != null)
+                {
+                    monthReport.PushPerson = users;
+                    Funs.DB.SubmitChanges();
+                    ShowNotify("提交成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+            }
+            #endregion
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs
new file mode 100644
index 00000000..e534a224
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPush.aspx.designer.cs
@@ -0,0 +1,105 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverReport {
+    
+    
+    public partial class MonthReportPush {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSubmit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSubmit;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// tvPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree tvPerson;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx
new file mode 100644
index 00000000..adfcc414
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx
@@ -0,0 +1,150 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportPushView.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportPushView" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>推送内容查看</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtMonthReportCode" runat="server" Label="编号" LabelAlign="Right" Readonly="true">
+                                            </f:TextBox>
+                                            <f:DatePicker ID="txtMonthReportDate" runat="server" Label="报告日期" LabelAlign="Right" Readonly="true"></f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="2 本月开车进展情况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form4" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label5" runat="server" Text="2.1 本月开车达到的主要控制点或里程碑点"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtMilestone" runat="server" Readonly="true" Height="140px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label6" runat="server" Text="2.2 本月完成的开车主要活动/工作"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtCompleteWork" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label7" runat="server" Text="2.3 上月存在问题的解决情况以及进展"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProblemSituation" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel8" Layout="Anchor" Title="6 下月开车计划要点" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form10" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label112" runat="server" Text="6.1 下月开车应达到的主要控制点或里程碑点。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthMilestone" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label23" runat="server" Text="6.2 下月应完成的开车主要活动。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthCompleteWork" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label24" runat="server" Text="6.3 下月新的基准进度计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthSchedule" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label25" runat="server" Text="6.4 下月主要开车用款计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthDrivingCost" runat="server" Readonly="true" Height="200px">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs
new file mode 100644
index 00000000..d8b6ea5e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace FineUIPro.Web.TestRun.DriverReport
+{
+    public partial class MonthReportPushView : PageBase
+    {
+        #region 页面加载
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string id = Request.Params["id"];
+                if (!string.IsNullOrEmpty(id))
+                {
+                    Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id);
+                    if (data != null)
+                    {
+                        this.hdId.Text = id;
+                        this.txtMonthReportCode.Text = data.MonthReportCode;
+                        this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : "";
+
+                        this.txtMilestone.Text = data.Milestone;
+                        this.txtCompleteWork.Text = data.CompleteWork;
+                        this.txtProblemSituation.Text = data.ProblemSituation;
+
+                        this.txtNextMonthMilestone.Text = data.NextMonthMilestone;
+                        this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork;
+                        this.txtNextMonthSchedule.Text = data.NextMonthSchedule;
+                        this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost;
+
+                    }
+                }
+                GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)";
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs
new file mode 100644
index 00000000..caab3950
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportPushView.aspx.designer.cs
@@ -0,0 +1,267 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverReport {
+    
+    
+    public partial class MonthReportPushView {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtMonthReportCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthReportCode;
+        
+        /// <summary>
+        /// txtMonthReportDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtMonthReportDate;
+        
+        /// <summary>
+        /// GroupPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel2;
+        
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label5;
+        
+        /// <summary>
+        /// txtMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtMilestone;
+        
+        /// <summary>
+        /// Label6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label6;
+        
+        /// <summary>
+        /// txtCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtCompleteWork;
+        
+        /// <summary>
+        /// Label7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label7;
+        
+        /// <summary>
+        /// txtProblemSituation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProblemSituation;
+        
+        /// <summary>
+        /// GroupPanel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel8;
+        
+        /// <summary>
+        /// Form10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form10;
+        
+        /// <summary>
+        /// Label112 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label112;
+        
+        /// <summary>
+        /// txtNextMonthMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthMilestone;
+        
+        /// <summary>
+        /// Label23 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label23;
+        
+        /// <summary>
+        /// txtNextMonthCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthCompleteWork;
+        
+        /// <summary>
+        /// Label24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label24;
+        
+        /// <summary>
+        /// txtNextMonthSchedule 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthSchedule;
+        
+        /// <summary>
+        /// Label25 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label25;
+        
+        /// <summary>
+        /// txtNextMonthDrivingCost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthDrivingCost;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx
new file mode 100644
index 00000000..47a99330
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx
@@ -0,0 +1,548 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MonthReportView.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverReport.MonthReportView" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>查看开车月报告</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:HiddenField ID="hdAttachUrl" runat="server">
+                        </f:HiddenField>
+                        <f:HiddenField ID="hdId" runat="server"></f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:ContentPanel ID="ContentPanel2" ShowBorder="true"
+                            BodyPadding="10px" EnableCollapse="true" ShowHeader="false" AutoScroll="true"
+                            runat="server">
+                            <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+                                BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+                                <Rows>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtMonthReportCode" runat="server" Label="编号" LabelAlign="Right" Readonly="true">
+                                            </f:TextBox>
+                                            <f:DatePicker ID="txtMonthReportDate" runat="server" Label="报告日期" LabelAlign="Right" Readonly="true"></f:DatePicker>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel1" Layout="Anchor" Title="1 项目概况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form3" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label1" runat="server" Text="1.1 项目名称、项目简称、用户名称、项目号"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectOverview" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label2" runat="server" Text="1.2 项目基本情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectBaseInfo" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label3" runat="server" Text="1.3 工程装置"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtEngineeringPlant" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label4" runat="server" Text="1.4 项目合同"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProjectContract" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel2" Layout="Anchor" Title="2 本月开车进展情况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form4" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label5" runat="server" Text="2.1 本月开车达到的主要控制点或里程碑点"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtMilestone" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label6" runat="server" Text="2.2 本月完成的开车主要活动/工作"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtCompleteWork" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label7" runat="server" Text="2.3 上月存在问题的解决情况以及进展"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProblemSituation" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel3" Layout="Anchor" Title="3 开车绩效测量" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form5" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label8" runat="server" Text="3.1 工作包完成情况统计"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="3.1 工作包完成情况统计" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItemId" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItemId"
+                                                                        EnableTextSelection="True">
+                                                                        <Columns>
+                                                                            <f:RenderField ColumnID="SortIndex" DataField="SortIndex"
+                                                                                FieldType="String" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Right" Width="90px">
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="WorkPackageType" DataField="WorkPackageType"
+                                                                                FieldType="String" HeaderText="类型" HeaderTextAlign="Center" Width="200px">
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="Unit" DataField="Unit"
+                                                                                FieldType="String" HeaderText="单位" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                            </f:RenderField>
+                                                                            <f:RenderField ColumnID="DesignCount" DataField="DesignCount"
+                                                                                FieldType="String" HeaderText="设计数量" HeaderTextAlign="Center" TextAlign="Center" Width="100px">
+                                                                            </f:RenderField>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="本月" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="MonthPlan" DataField="MonthPlan"
+                                                                                        FieldType="String" HeaderText="计划完成" HeaderTextAlign="Center" Width="100px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="MonthActual" DataField="MonthActual"
+                                                                                        FieldType="String" HeaderText="实际完成" HeaderTextAlign="Center" Width="100px">
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                            <f:GroupField ColumnID="GroupField2" HeaderText="累计" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TotalPlan" DataField="TotalPlan"
+                                                                                        FieldType="String" HeaderText="计划完成" HeaderTextAlign="Center" Width="100px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="TatalActual" DataField="TatalActual"
+                                                                                        FieldType="String" HeaderText="实际完成" HeaderTextAlign="Center" Width="100px">
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                            <f:RenderField ColumnID="CompletionRate" DataField="CompletionRate"
+                                                                                FieldType="String" HeaderText="总完成率" HeaderTextAlign="Center" Width="100px">
+                                                                            </f:RenderField>
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label9" runat="server" Text="3.2 开车绩效测量数据"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="3.2 开车绩效测量数据（本月）" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItem2Id" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItem2Id"
+                                                                        EnableTextSelection="True" SortField="SortIndex">
+                                                                        <Columns>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="本月" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TypeName" DataField="TypeName"
+                                                                                        FieldType="String" HeaderText="" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="PV" DataField="PV"
+                                                                                        FieldType="String" HeaderText="PV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="EV" DataField="EV"
+                                                                                        FieldType="String" HeaderText="EV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="AC" DataField="AC"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CV" DataField="CV"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SV" DataField="SV"
+                                                                                        FieldType="String" HeaderText="SV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CPI" DataField="CPI"
+                                                                                        FieldType="String" HeaderText="CPI" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SPI" DataField="SPI"
+                                                                                        FieldType="String" HeaderText="SPI" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SortIndex" DataField="SortIndex"
+                                                                                        FieldType="String" HeaderText="SortIndex" HeaderTextAlign="Center" Width="120px" Hidden="true">
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="3.2 开车绩效测量数据（本月）" EnableCollapse="true"
+                                                                        runat="server" BoxFlex="1" DataKeyNames="MonthReportItem2Id" AllowCellEditing="true" ClicksToEdit="1" DataIDField="MonthReportItem2Id"
+                                                                        EnableTextSelection="True" SortField="SortIndex">
+                                                                        <Columns>
+                                                                            <f:GroupField ColumnID="GroupField1" HeaderText="累计" HeaderTextAlign="Center">
+                                                                                <Columns>
+                                                                                    <f:RenderField ColumnID="TypeName" DataField="TypeName"
+                                                                                        FieldType="String" HeaderText="" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="PV" DataField="PV"
+                                                                                        FieldType="String" HeaderText="PV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="EV" DataField="EV"
+                                                                                        FieldType="String" HeaderText="EV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="AC" DataField="AC"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CV" DataField="CV"
+                                                                                        FieldType="String" HeaderText="AC" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SV" DataField="SV"
+                                                                                        FieldType="String" HeaderText="SV" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="CPI" DataField="CPI"
+                                                                                        FieldType="String" HeaderText="CPI" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                    <f:RenderField ColumnID="SPI" DataField="SPI"
+                                                                                        FieldType="String" HeaderText="SPI" HeaderTextAlign="Center" Width="120px">
+                                                                                    </f:RenderField>
+                                                                                </Columns>
+                                                                            </f:GroupField>
+                                                                        </Columns>
+                                                                    </f:Grid>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label10" runat="server" Text="（根据赢得值原理，对开车进行进度、费用综合检测，给出上表中本月的和累计的开车绩效测量数据，这些数据的定义如下）"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label11" runat="server" Text="（1）计划值PV（也称为计划工作预算成本BCWS）"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label12" runat="server" Text="（2）实际成本AC(也称为已完成工作的实际成本ACWP)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label13" runat="server" Text="（3）赢得值EV(也称为挣值或已完成工作的预算成本BCWP)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label14" runat="server" Text="（4）成本偏差CV (CV=EV-AC)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label15" runat="server" Text="（5）成本偏差率CVR (CVR=CV/Ev x 100%)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label16" runat="server" Text="（6）进度偏差SV (SV=EV-PV)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label17" runat="server" Text="（7）进度偏差率SVR (SVR=SV/PV x 100%)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label18" runat="server" Text="（8）成本绩效指数CPI (CPI=EV/AC)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label19" runat="server" Text="（9）进度绩效指数 SPI (SPI = EV/PV)"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label20" runat="server" Text="3.3 开车费用预算值、实际值"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:GroupPanel ID="GroupPanel4" Layout="Anchor" Title="预算值" runat="server">
+                                                                        <Items>
+                                                                            <f:Form ID="Form6" runat="server" ShowHeader="false" ShowBorder="false">
+                                                                                <Rows>
+                                                                                    <f:FormRow>
+                                                                                        <Items>
+                                                                                            <f:NumberBox ID="txtBudget" runat="server" Label="本月" LabelAlign="Right" NoNegative="true" Readonly="true"></f:NumberBox>
+                                                                                            <f:NumberBox ID="txtBudgetTotal" runat="server" Label="累计" LabelAlign="Right" NoNegative="true" Readonly="true"></f:NumberBox>
+                                                                                        </Items>
+                                                                                    </f:FormRow>
+                                                                                </Rows>
+                                                                            </f:Form>
+                                                                        </Items>
+                                                                    </f:GroupPanel>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="实际值" runat="server">
+                                                                        <Items>
+                                                                            <f:Form ID="Form7" runat="server" ShowHeader="false" ShowBorder="false">
+                                                                                <Rows>
+                                                                                    <f:FormRow>
+                                                                                        <Items>
+                                                                                            <f:NumberBox ID="txtActualCost" runat="server" Label="本月" LabelAlign="Right" NoNegative="true" Readonly="true"></f:NumberBox>
+                                                                                            <f:NumberBox ID="txtActualCostTotal" runat="server" Label="累计" LabelAlign="Right" NoNegative="true" Readonly="true"></f:NumberBox>
+                                                                                        </Items>
+                                                                                    </f:FormRow>
+                                                                                </Rows>
+                                                                            </f:Form>
+                                                                        </Items>
+                                                                    </f:GroupPanel>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel6" Layout="Anchor" Title="4 项目变更说明" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form8" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label21" runat="server" Text="4.1 本月开车内部变更和外部变更发表情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtPublicationStatus" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label22" runat="server" Text="4.2 本月开车内部变更和外部变更实施情况"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtImplementationStatus" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel7" Layout="Anchor" Title="5 HSE管理情况" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form9" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtHSEManageSituation" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel8" Layout="Anchor" Title="6 下月开车计划要点" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form10" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label112" runat="server" Text="6.1 下月开车应达到的主要控制点或里程碑点。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthMilestone" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label23" runat="server" Text="6.2 下月应完成的开车主要活动。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthCompleteWork" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label24" runat="server" Text="6.3 下月新的基准进度计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthSchedule" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label25" runat="server" Text="6.4 下月主要开车用款计划"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtNextMonthDrivingCost" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:GroupPanel ID="GroupPanel9" Layout="Anchor" Title="7 存在的主要问题及改进措施" runat="server">
+                                                <Items>
+                                                    <f:Form ID="Form11" runat="server" ShowHeader="false" ShowBorder="false">
+                                                        <Rows>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label26" runat="server" Text="7.1 开车目前存在的主要问题及改进措施"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtProblemsMeasures" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:Label ID="Label27" runat="server" Text="7.2 需要项目经理、项目主管、相关部门以及用户解决的问题。"></f:Label>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                            <f:FormRow>
+                                                                <Items>
+                                                                    <f:TextArea ID="txtSolvedProblems" runat="server" Readonly="true">
+                                                                    </f:TextArea>
+                                                                </Items>
+                                                            </f:FormRow>
+                                                        </Rows>
+                                                    </f:Form>
+                                                </Items>
+                                            </f:GroupPanel>
+                                        </Items>
+                                    </f:FormRow>
+                                    <f:FormRow runat="server">
+                                        <Items>
+                                            <f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
+                                                <Items>
+                                                    <f:Label ID="lblAttach" runat="server" Label="上传附件"
+                                                        LabelWidth="150px">
+                                                    </f:Label>
+                                                    <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
+                                                    </f:Button>
+                                                </Items>
+                                            </f:Panel>
+                                        </Items>
+                                    </f:FormRow>
+                                </Rows>
+                            </f:Form>
+                        </f:ContentPanel>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs
new file mode 100644
index 00000000..1a7c5c2c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+
+namespace FineUIPro.Web.TestRun.DriverReport
+{
+    public partial class MonthReportView : PageBase
+    {
+        #region 定义集合
+        /// <summary>
+        /// 工作包完成情况统计
+        /// </summary>
+        public static List<Model.TestRun_MonthReportItem> monthReportItems = new List<Model.TestRun_MonthReportItem>();
+
+        /// <summary>
+        /// 开车绩效测量数据
+        /// </summary>
+        public static List<Model.TestRun_MonthReportItem2> monthReportItems2 = new List<Model.TestRun_MonthReportItem2>();
+        #endregion
+
+        #region 页面加载
+        /// <summary>
+        /// 页面加载
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                string id = Request.Params["id"];
+                if (!string.IsNullOrEmpty(id))
+                {
+                    Model.TestRun_MonthReport data = BLL.TestRun_MonthReportService.GetMonthReportById(id);
+                    if (data != null)
+                    {
+                        this.hdId.Text = id;
+                        this.txtMonthReportCode.Text = data.MonthReportCode;
+                        this.txtMonthReportDate.Text = data.MonthReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.MonthReportDate) : "";
+                        this.txtProjectOverview.Text = data.ProjectOverview;
+                        this.txtProjectBaseInfo.Text = data.ProjectBaseInfo;
+                        this.txtEngineeringPlant.Text = data.EngineeringPlant;
+                        this.txtProjectContract.Text = data.ProjectContract;
+                        this.txtMilestone.Text = data.Milestone;
+                        this.txtCompleteWork.Text = data.CompleteWork;
+                        this.txtProblemSituation.Text = data.ProblemSituation;
+                        this.txtBudget.Text = data.Budget.HasValue ? data.Budget.ToString() : "";
+                        this.txtBudgetTotal.Text = data.BudgetTotal.HasValue ? data.BudgetTotal.ToString() : "";
+                        this.txtActualCost.Text = data.ActualCost.HasValue ? data.ActualCost.ToString() : "";
+                        this.txtActualCostTotal.Text = data.ActualCostTotal.HasValue ? data.ActualCostTotal.ToString() : "";
+                        this.txtPublicationStatus.Text = data.PublicationStatus;
+                        this.txtImplementationStatus.Text = data.ImplementationStatus;
+                        this.txtHSEManageSituation.Text = data.HSEManageSituation;
+                        this.txtNextMonthMilestone.Text = data.NextMonthMilestone;
+                        this.txtNextMonthCompleteWork.Text = data.NextMonthCompleteWork;
+                        this.txtNextMonthSchedule.Text = data.NextMonthSchedule;
+                        this.txtNextMonthDrivingCost.Text = data.NextMonthDrivingCost;
+                        this.txtProblemsMeasures.Text = data.ProblemsMeasures;
+                        this.txtSolvedProblems.Text = data.SolvedProblems;
+                    }
+
+                    var items = BLL.TestRun_MonthReportItemService.GetMonthReportItemByReportId(this.hdId.Text);
+                    if (items.Count > 0)
+                    {
+                        this.Grid1.DataSource = items;
+                        this.Grid1.DataBind();
+                    }
+
+                    var items2 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "1");
+                    if (items2.Count > 0)
+                    {
+                        this.Grid2.DataSource = items2;
+                        this.Grid2.DataBind();
+                    }
+
+                    var items3 = BLL.TestRun_MonthReportItem2Service.GetMonthReportItem2ByReportId(this.hdId.Text, "2");
+                    if (items3.Count > 0)
+                    {
+                        this.Grid3.DataSource = items3;
+                        this.Grid3.DataBind();
+                    }
+                }
+                GroupPanel8.Title = "下月开车计划要点(" + Convert.ToDateTime(this.txtMonthReportDate.Text).AddMonths(1).Month + "月份)";
+            }
+        }
+        #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttach_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.hdId.Text))
+            {
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverReport/MonthReport&menuId={1}", this.hdId.Text, BLL.Const.MonthReportMenuId)));
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs
new file mode 100644
index 00000000..228ff735
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportView.aspx.designer.cs
@@ -0,0 +1,771 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverReport {
+    
+    
+    public partial class MonthReportView {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// hdAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdAttachUrl;
+        
+        /// <summary>
+        /// hdId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdId;
+        
+        /// <summary>
+        /// ContentPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel ContentPanel2;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtMonthReportCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMonthReportCode;
+        
+        /// <summary>
+        /// txtMonthReportDate 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtMonthReportDate;
+        
+        /// <summary>
+        /// GroupPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel1;
+        
+        /// <summary>
+        /// Form3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form3;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtProjectOverview 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectOverview;
+        
+        /// <summary>
+        /// Label2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label2;
+        
+        /// <summary>
+        /// txtProjectBaseInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectBaseInfo;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEngineeringPlant 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtEngineeringPlant;
+        
+        /// <summary>
+        /// Label4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label4;
+        
+        /// <summary>
+        /// txtProjectContract 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProjectContract;
+        
+        /// <summary>
+        /// GroupPanel2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel2;
+        
+        /// <summary>
+        /// Form4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form4;
+        
+        /// <summary>
+        /// Label5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label5;
+        
+        /// <summary>
+        /// txtMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtMilestone;
+        
+        /// <summary>
+        /// Label6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label6;
+        
+        /// <summary>
+        /// txtCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtCompleteWork;
+        
+        /// <summary>
+        /// Label7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label7;
+        
+        /// <summary>
+        /// txtProblemSituation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProblemSituation;
+        
+        /// <summary>
+        /// GroupPanel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel3;
+        
+        /// <summary>
+        /// Form5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form5;
+        
+        /// <summary>
+        /// Label8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label8;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Label9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label9;
+        
+        /// <summary>
+        /// Grid2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid2;
+        
+        /// <summary>
+        /// Grid3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid3;
+        
+        /// <summary>
+        /// Label10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label10;
+        
+        /// <summary>
+        /// Label11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label11;
+        
+        /// <summary>
+        /// Label12 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label12;
+        
+        /// <summary>
+        /// Label13 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label13;
+        
+        /// <summary>
+        /// Label14 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label14;
+        
+        /// <summary>
+        /// Label15 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label15;
+        
+        /// <summary>
+        /// Label16 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label16;
+        
+        /// <summary>
+        /// Label17 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label17;
+        
+        /// <summary>
+        /// Label18 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label18;
+        
+        /// <summary>
+        /// Label19 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label19;
+        
+        /// <summary>
+        /// Label20 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label20;
+        
+        /// <summary>
+        /// GroupPanel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel4;
+        
+        /// <summary>
+        /// Form6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form6;
+        
+        /// <summary>
+        /// txtBudget 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtBudget;
+        
+        /// <summary>
+        /// txtBudgetTotal 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtBudgetTotal;
+        
+        /// <summary>
+        /// GroupPanel5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel5;
+        
+        /// <summary>
+        /// Form7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form7;
+        
+        /// <summary>
+        /// txtActualCost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtActualCost;
+        
+        /// <summary>
+        /// txtActualCostTotal 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtActualCostTotal;
+        
+        /// <summary>
+        /// GroupPanel6 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel6;
+        
+        /// <summary>
+        /// Form8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form8;
+        
+        /// <summary>
+        /// Label21 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label21;
+        
+        /// <summary>
+        /// txtPublicationStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtPublicationStatus;
+        
+        /// <summary>
+        /// Label22 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label22;
+        
+        /// <summary>
+        /// txtImplementationStatus 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtImplementationStatus;
+        
+        /// <summary>
+        /// GroupPanel7 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel7;
+        
+        /// <summary>
+        /// Form9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form9;
+        
+        /// <summary>
+        /// txtHSEManageSituation 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtHSEManageSituation;
+        
+        /// <summary>
+        /// GroupPanel8 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel8;
+        
+        /// <summary>
+        /// Form10 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form10;
+        
+        /// <summary>
+        /// Label112 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label112;
+        
+        /// <summary>
+        /// txtNextMonthMilestone 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthMilestone;
+        
+        /// <summary>
+        /// Label23 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label23;
+        
+        /// <summary>
+        /// txtNextMonthCompleteWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthCompleteWork;
+        
+        /// <summary>
+        /// Label24 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label24;
+        
+        /// <summary>
+        /// txtNextMonthSchedule 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthSchedule;
+        
+        /// <summary>
+        /// Label25 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label25;
+        
+        /// <summary>
+        /// txtNextMonthDrivingCost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtNextMonthDrivingCost;
+        
+        /// <summary>
+        /// GroupPanel9 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupPanel GroupPanel9;
+        
+        /// <summary>
+        /// Form11 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form11;
+        
+        /// <summary>
+        /// Label26 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label26;
+        
+        /// <summary>
+        /// txtProblemsMeasures 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtProblemsMeasures;
+        
+        /// <summary>
+        /// Label27 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label27;
+        
+        /// <summary>
+        /// txtSolvedProblems 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtSolvedProblems;
+        
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+        
+        /// <summary>
+        /// lblAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblAttach;
+        
+        /// <summary>
+        /// btnAttach 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttach;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx
index 8dabe73c..73316757 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx
@@ -20,7 +20,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
                                 <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,24 +38,24 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
+                        <%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
                             FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="DriverReporName" DataField="DriverReporName"
                             FieldType="String" HeaderText="报告名称" HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DriverReportCode" DataField="DriverReportCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="CompilePersonName" DataField="CompilePersonName"
                             FieldType="String" HeaderText="编制人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交时间" HeaderTextAlign="Center" Width="110px">
+                            FieldType="Date" Renderer="Date" HeaderText="编制时间" HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Number" DataField="Number"
+                        <%--<f:RenderField ColumnID="Number" DataField="Number"
                             FieldType="String" HeaderText="期数" HeaderTextAlign="Center" Width="150px">
-                        </f:RenderField>
+                        </f:RenderField>--%>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs
index 9c823633..7aab550c 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("PropertyReportEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -44,11 +44,11 @@ namespace FineUIPro.Web.TestRun.DriverReport
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='5'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND report.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
+            //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND report.UnitWorkId=@unitWorkId";
+            //    listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
+            //}
             if (!string.IsNullOrEmpty(this.txtDriverReporName.Text.Trim()))
             {
                 strSql += " AND report.DriverReporName LIKE @DriverReporName";
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs
index 77f30347..ab6e7b91 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// drpUnitWorkId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
         /// <summary>
         /// txtDriverReporName 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx
index d343f975..40d9a7e1 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx
@@ -34,20 +34,20 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                  <%--  <f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:TextBox ID="txtDriverReportCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            <f:TextBox ID="txtDriverReporName" runat="server" Label="报告名称" LabelAlign="Right" LabelWidth="150px" MaxLength="100" Required="true" ShowRedStar="true">
                                             </f:TextBox>
                                         </Items>
                                     </f:FormRow>
@@ -59,15 +59,15 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="编制日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtNumber" runat="server" Label="期数" LabelAlign="Right" LabelWidth="150px" MaxLength="50">
                                             </f:TextBox>
                                         </Items>
-                                    </f:FormRow>
+                                    </f:FormRow>--%>
                                     <f:FormRow>
                                         <Items>
                                             <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" LabelWidth="150px" MaxLength="500">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs
index 37328c76..f8682e46 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
 
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
@@ -24,15 +24,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
+                        //if (!string.IsNullOrEmpty(data.UnitWorkId))
+                        //{
+                        //    this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
+                        //}
                         this.txtDriverReportCode.Text = data.DriverReportCode;
                         this.txtDriverReporName.Text = data.DriverReporName;
                         this.txtCompilePerson.Text = BLL.UserService.GetUserNameByUserId(data.CompilePerson);
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
-                        this.txtNumber.Text = data.Number;
+                        //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
                     }
                 }
@@ -71,15 +71,15 @@ namespace FineUIPro.Web.TestRun.DriverReport
         {
             string id = Request.Params["id"];
             Model.Driver_DriverReport newData = new Model.Driver_DriverReport();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
+            //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            //}
             newData.DriverReportCode = this.txtDriverReportCode.Text.Trim();
             newData.DriverReporName = this.txtDriverReporName.Text.Trim();
             newData.CompilePerson = this.CurrUser.UserId;
             newData.SubmitDate = Funs.GetNewDateTime(this.txtSubmitDate.Text.Trim());
-            newData.Number = this.txtNumber.Text.Trim();
+            //newData.Number = this.txtNumber.Text.Trim();
             newData.Remark = this.txtRemark.Text.Trim();
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs
index dd497401..46c7a283 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtDriverReportCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtDriverReportCode;
         
         /// <summary>
         /// txtDriverReporName 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.TextBox txtDriverReporName;
         
-        /// <summary>
-        /// txtDriverReportCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverReportCode;
-        
         /// <summary>
         /// txtCompilePerson 控件。
         /// </summary>
@@ -147,15 +138,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtSubmitDate;
         
-        /// <summary>
-        /// txtNumber 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtNumber;
-        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx
index e75ec969..0a5dc407 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx
@@ -20,7 +20,7 @@
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>
+                                <%--<f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right"></f:DropDownList>--%>
                                 <f:TextBox ID="txtSummary" runat="server" Label="完工总结" LabelAlign="Right"></f:TextBox>
                                 <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索"
                                     EnablePostBack="true" runat="server" OnClick="btnSearch_Click">
@@ -38,20 +38,20 @@
                                 <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
+                        <%--<f:RenderField ColumnID="UnitWorkName" DataField="UnitWorkName"
                             FieldType="String" HeaderText="单位工程" HeaderTextAlign="Center" Width="120px">
+                        </f:RenderField>--%>
+                        <f:RenderField ColumnID="DriverSummaryCode" DataField="DriverSummaryCode"
+                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
                         </f:RenderField>
                         <f:RenderField ColumnID="Summary" DataField="Summary"
                             FieldType="String" HeaderText="完工总结" HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="DriverSummaryCode" DataField="DriverSummaryCode"
-                            FieldType="String" HeaderText="编号" HeaderTextAlign="Center" Width="200px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="SummaryPersonName" DataField="SummaryPersonName"
                             FieldType="String" HeaderText="总结人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
                         <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            FieldType="Date" Renderer="Date" HeaderText="提交日期" HeaderTextAlign="Center" Width="110px">
+                            FieldType="Date" Renderer="Date" HeaderText="总结日期" HeaderTextAlign="Center" Width="110px">
                         </f:RenderField>
                         <f:RenderField ColumnID="Remark" DataField="Remark"
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs
index 6ba5691b..47e0cb53 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs
@@ -17,7 +17,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary
                 GetButtonPower();
                 BindGrid();
                 btnNew.OnClientClick = Window1.GetShowReference("CompleteSummaryEdit.aspx") + "return false;";
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -43,11 +43,11 @@ namespace FineUIPro.Web.TestRun.DriverSummary
                             + @" WHERE summary.ProjectId=@projectId AND summary.SummaryType='2'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                strSql += " AND summary.UnitWorkId=@unitWorkId";
-                listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
-            }
+            //if (!string.IsNullOrEmpty(this.drpUnitWorkId.SelectedValue) && this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    strSql += " AND summary.UnitWorkId=@unitWorkId";
+            //    listStr.Add(new SqlParameter("@unitWorkId", this.drpUnitWorkId.SelectedValue));
+            //}
             if (!string.IsNullOrEmpty(this.txtSummary.Text.Trim()))
             {
                 strSql += " AND summary.Summary LIKE @Summary";
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs
index c92a5bb4..eb61c214 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.designer.cs
@@ -57,15 +57,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
-        /// <summary>
-        /// drpUnitWorkId 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
-        
         /// <summary>
         /// txtSummary 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx
index 167b3516..b6c3759d 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx
@@ -34,10 +34,16 @@
                             <f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true"
                                 BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
                                 <Rows>
-                                    <f:FormRow>
+                                    <%--<f:FormRow>
                                         <Items>
                                             <f:DropDownList ID="drpUnitWorkId" runat="server" Label="单位工程" LabelAlign="Right" LabelWidth="150px"></f:DropDownList>
                                         </Items>
+                                    </f:FormRow>--%>
+                                    <f:FormRow>
+                                        <Items>
+                                            <f:TextBox ID="txtDriverSummaryCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
+                                            </f:TextBox>
+                                        </Items>
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
@@ -45,12 +51,6 @@
                                             </f:TextArea>
                                         </Items>
                                     </f:FormRow>
-                                    <f:FormRow>
-                                        <Items>
-                                            <f:TextBox ID="txtDriverSummaryCode" runat="server" Label="编号" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Required="true" ShowRedStar="true">
-                                            </f:TextBox>
-                                        </Items>
-                                    </f:FormRow>
                                     <f:FormRow>
                                         <Items>
                                             <f:TextBox ID="txtSummaryPerson" runat="server" Label="总结人" LabelAlign="Right" LabelWidth="150px" MaxLength="50" Readonly="true">
@@ -59,7 +59,7 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="提交日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
+                                            <f:DatePicker ID="txtSubmitDate" runat="server" Label="总结日期" LabelAlign="Right" LabelWidth="150px"></f:DatePicker>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs
index 326d6f70..60578150 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.cs
@@ -15,7 +15,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary
         {
             if (!IsPostBack)
             {
-                BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
 
                 string id = Request.Params["id"];
                 if (!string.IsNullOrEmpty(id))
@@ -24,10 +24,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary
                     if (data != null)
                     {
                         this.hdId.Text = id;
-                        if (!string.IsNullOrEmpty(data.UnitWorkId))
-                        {
-                            this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
-                        }
+                        //if (!string.IsNullOrEmpty(data.UnitWorkId))
+                        //{
+                        //    this.drpUnitWorkId.SelectedValue = data.UnitWorkId;
+                        //}
                         this.txtDriverSummaryCode.Text = data.DriverSummaryCode;
                         this.txtSummary.Text = data.Summary;
                         this.txtSummaryPerson.Text = BLL.UserService.GetUserNameByUserId(data.SummaryPerson);
@@ -70,10 +70,10 @@ namespace FineUIPro.Web.TestRun.DriverSummary
         {
             string id = Request.Params["id"];
             Model.Driver_DriverSummary newData = new Model.Driver_DriverSummary();
-            if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
-            {
-                newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
-            }
+            //if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null)
+            //{
+            //    newData.UnitWorkId = this.drpUnitWorkId.SelectedValue;
+            //}
             newData.DriverSummaryCode = this.txtDriverSummaryCode.Text.Trim();
             newData.Summary = this.txtSummary.Text.Trim();
             newData.SummaryPerson = this.CurrUser.UserId;
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs
index 0399124d..36532e30 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummaryEdit.aspx.designer.cs
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// drpUnitWorkId 控件。
+        /// txtDriverSummaryCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DropDownList drpUnitWorkId;
+        protected global::FineUIPro.TextBox txtDriverSummaryCode;
         
         /// <summary>
         /// txtSummary 控件。
@@ -120,15 +120,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary {
         /// </remarks>
         protected global::FineUIPro.TextArea txtSummary;
         
-        /// <summary>
-        /// txtDriverSummaryCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDriverSummaryCode;
-        
         /// <summary>
         /// txtSummaryPerson 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index d8c81922..528fef75 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -13,6 +13,7 @@
 <TreeNode id="318589ea-2367-4e68-905a-9d7957138df5" Text="设计交底管理" NavigateUrl="CQMS/Comprehensive/DesignDetails.aspx"></TreeNode>
 <TreeNode id="681eab0b-11ae-4829-b421-408918beaed0" Text="施工组织设计及施工方案" NavigateUrl="CQMS/Comprehensive/GeneralPlanApproval.aspx"></TreeNode>
 <TreeNode id="fd116c94-714b-4b92-a3c9-cc83d358e2b3" Text="超过一定规模的危大施工方案" NavigateUrl="CQMS/Comprehensive/MajorPlanApproval.aspx"></TreeNode>
+<TreeNode id="A70EA41D-0B45-4753-AC77-BF28DA066402" Text="检验试验计划管理" NavigateUrl="CQMS/Comprehensive/InspectionTestPlan.aspx"></TreeNode>
 <TreeNode id="7e628f48-385f-4d52-8063-d0f812514316" Text="NCR管理" NavigateUrl="CQMS/Comprehensive/NCRManagement.aspx"></TreeNode>
 <TreeNode id="9ac06df6-b91a-42bb-9a51-5cd59d8733a9" Text="特种设备管理" NavigateUrl="CQMS/Comprehensive/SpecialEquipment.aspx"></TreeNode>
 <TreeNode id="49b87812-c07d-4b0e-9909-960e5cd822c7" Text="压力管道管理" NavigateUrl="CQMS/Comprehensive/PressurePipe.aspx"></TreeNode>
@@ -20,12 +21,13 @@
 <TreeNode id="a4f071a6-51cb-45b1-bbac-93a02f1cb98a" Text="资料接收登记" NavigateUrl="CQMS/Comprehensive/DataReceiving.aspx"></TreeNode>
 <TreeNode id="4a9df3ce-88fd-42a4-aac2-5a7b86edd578" Text="资料发放登记" NavigateUrl="CQMS/Comprehensive/DataDistribution.aspx"></TreeNode>
 <TreeNode id="d8de4143-b680-44cf-9a78-acd3d49a8d00" Text="图纸收发记录" NavigateUrl="CQMS/Comprehensive/DesignDrawings.aspx"></TreeNode>
+<TreeNode id="856D53B3-C5FB-443F-917B-39E83BE685DB" Text="图纸会审管理" NavigateUrl="CQMS/Comprehensive/ReviewDrawings.aspx"></TreeNode>
 <TreeNode id="B2086D3A-2384-487E-AFFB-6FACDD09B621" Text="质量数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="149f1f1c-a925-412b-970e-e9b79d54e03f" Text="过程控制" NavigateUrl=""><TreeNode id="4781f467-35bf-4cf2-aaa4-7960a175eb61" Text="共检通知单" NavigateUrl="CQMS/ProcessControl/InspectionNotice.aspx"></TreeNode>
 <TreeNode id="e728cc1a-fd65-4f1a-8f22-2b72e62f78ee" Text="控制点检查检测" NavigateUrl="CQMS/ProcessControl/InspectionManagement.aspx"></TreeNode>
 <TreeNode id="d563d7a9-e574-4e25-b868-a124aa789789" Text="控制点检查检测合格率统计" NavigateUrl="CQMS/ProcessControl/InspectionManagementStatistics.aspx"></TreeNode>
-<TreeNode id="ec1d25f6-fc6d-4b76-877d-d545669b21c9" Text="无损检测管理" NavigateUrl="CQMS/ProcessControl/NondestructiveTest.aspx"></TreeNode>
+<TreeNode id="9CB732E5-21D3-4B5D-ABF9-1DADB1CA3A88" Text="无损检测管理" NavigateUrl="CQMS/ProcessControl/NondestructiveTest_New.aspx"></TreeNode>
 <TreeNode id="e6b18529-5d1b-4fde-bdab-7354b996e5de" Text="热处理检测" NavigateUrl="CQMS/ProcessControl/HotProessManage.aspx"></TreeNode>
 <TreeNode id="6177c436-5cc7-4ed9-929c-6b7d2082fd28" Text="管道试压包管理" NavigateUrl="CQMS/ProcessControl/TestPackageManagement.aspx"></TreeNode>
 <TreeNode id="3e0bf9b3-b497-4627-b93c-367dd60f901d" Text="检查人检查次数统计" NavigateUrl="CQMS/ProcessControl/CheckManStatistics.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
index 8a497c41..ac8364da 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml
@@ -7,6 +7,4 @@
 <TreeNode id="AAF841AA-2EE8-4FEC-B1FB-B978736C6E1F" Text="员工责任书" NavigateUrl="Personal/PersonDuty.aspx"></TreeNode>
 <TreeNode id="CB373458-30B0-4850-ABFF-B38D40A04D43" Text="员工绩效考核结果" NavigateUrl="Personal/PersonCheckInfo.aspx"></TreeNode>
 <TreeNode id="6549EF60-1DED-4912-8D2D-7B32A80A2DEC" Text="视频会议" NavigateUrl="Personal/PersonMeeting.aspx"></TreeNode>
-<TreeNode id="522EAECC-3D40-4804-A066-A43BA8F6BFC1" Text="员工出差记录" NavigateUrl="Personal/BusinessTrip.aspx"></TreeNode>
-<TreeNode id="16229932-671B-4E04-BB61-A5C7DE4CE47F" Text="员工开车绩效记录" NavigateUrl="Personal/TestRunPerformance.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index 04118906..ecabe79c 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -99,8 +99,7 @@
 <TreeNode id="E453EEE9-9D6A-454B-AB17-A6E284B7A95F" Text="开车周例会" NavigateUrl="TestRun/Meeting/WeekMeeting.aspx"></TreeNode>
 <TreeNode id="420456A5-22E7-45BF-A4CA-8412F4C7D1B9" Text="开车专题会" NavigateUrl="TestRun/Meeting/SpecialMeeting.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="9EDB56DF-6A3C-49B8-AC60-F6A5E9B0A813" Text="开车报告" NavigateUrl=""><TreeNode id="E4DD3689-0A72-43A5-8058-34C14D1FA4B0" Text="开车周报告" NavigateUrl="TestRun/DriverReport/WeekReport.aspx"></TreeNode>
-<TreeNode id="9ABFEB7D-9DFC-4286-9139-DAEAB8E311F7" Text="开车月报告" NavigateUrl="TestRun/DriverReport/MonthReport.aspx"></TreeNode>
+<TreeNode id="9EDB56DF-6A3C-49B8-AC60-F6A5E9B0A813" Text="开车报告" NavigateUrl=""><TreeNode id="9ABFEB7D-9DFC-4286-9139-DAEAB8E311F7" Text="开车月报告" NavigateUrl="TestRun/DriverReport/MonthReport.aspx"></TreeNode>
 <TreeNode id="A6AC39B3-378A-476B-94A8-C6F1C4BFAF74" Text="联动试车报告" NavigateUrl="TestRun/DriverReport/LinkedTestRunReport.aspx"></TreeNode>
 <TreeNode id="5633B9E9-9299-4D16-A7BC-84B1C9D17262" Text="投料试车报告" NavigateUrl="TestRun/DriverReport/FeedTestRunReport.aspx"></TreeNode>
 <TreeNode id="EC4B11B4-AF9B-44E9-8CD4-364A5633CB76" Text="性能考核报告" NavigateUrl="TestRun/DriverReport/PropertyReport.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 533bee11..cc7e0f27 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -84,6 +84,5 @@
 <TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
 <TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
-<TreeNode id="C1240FCB-4C72-445E-82B5-EBFAA87D0AC6" Text="开车人员月绩效报告" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceMonthReport.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 92500e71..bb27d5c1 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -593,6 +593,9 @@ namespace Model
     partial void InsertComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance);
     partial void UpdateComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance);
     partial void DeleteComprehensive_QualityAccidentApprove(Comprehensive_QualityAccidentApprove instance);
+    partial void InsertComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance);
+    partial void UpdateComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance);
+    partial void DeleteComprehensive_ReviewDrawings(Comprehensive_ReviewDrawings instance);
     partial void InsertComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance);
     partial void UpdateComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance);
     partial void DeleteComprehensive_SiteVisaManagement(Comprehensive_SiteVisaManagement instance);
@@ -1256,6 +1259,9 @@ namespace Model
     partial void InsertInspection_SummaryMb(Inspection_SummaryMb instance);
     partial void UpdateInspection_SummaryMb(Inspection_SummaryMb instance);
     partial void DeleteInspection_SummaryMb(Inspection_SummaryMb instance);
+    partial void InsertInspection_Test_Plan(Inspection_Test_Plan instance);
+    partial void UpdateInspection_Test_Plan(Inspection_Test_Plan instance);
+    partial void DeleteInspection_Test_Plan(Inspection_Test_Plan instance);
     partial void InsertInterFaceLog(InterFaceLog instance);
     partial void UpdateInterFaceLog(InterFaceLog instance);
     partial void DeleteInterFaceLog(InterFaceLog instance);
@@ -1754,6 +1760,9 @@ namespace Model
     partial void InsertProcessControl_NondestructiveTest(ProcessControl_NondestructiveTest instance);
     partial void UpdateProcessControl_NondestructiveTest(ProcessControl_NondestructiveTest instance);
     partial void DeleteProcessControl_NondestructiveTest(ProcessControl_NondestructiveTest instance);
+    partial void InsertProcessControl_NondestructiveTest_New(ProcessControl_NondestructiveTest_New instance);
+    partial void UpdateProcessControl_NondestructiveTest_New(ProcessControl_NondestructiveTest_New instance);
+    partial void DeleteProcessControl_NondestructiveTest_New(ProcessControl_NondestructiveTest_New instance);
     partial void InsertProcessControl_TestPackageManagement(ProcessControl_TestPackageManagement instance);
     partial void UpdateProcessControl_TestPackageManagement(ProcessControl_TestPackageManagement instance);
     partial void DeleteProcessControl_TestPackageManagement(ProcessControl_TestPackageManagement instance);
@@ -1952,6 +1961,9 @@ namespace Model
     partial void InsertReport_Comprehensive(Report_Comprehensive instance);
     partial void UpdateReport_Comprehensive(Report_Comprehensive instance);
     partial void DeleteReport_Comprehensive(Report_Comprehensive instance);
+    partial void InsertReport_Construction_Plan(Report_Construction_Plan instance);
+    partial void UpdateReport_Construction_Plan(Report_Construction_Plan instance);
+    partial void DeleteReport_Construction_Plan(Report_Construction_Plan instance);
     partial void InsertReport_ConstructionProblems(Report_ConstructionProblems instance);
     partial void UpdateReport_ConstructionProblems(Report_ConstructionProblems instance);
     partial void DeleteReport_ConstructionProblems(Report_ConstructionProblems instance);
@@ -2300,6 +2312,15 @@ namespace Model
     partial void InsertTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance);
     partial void UpdateTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance);
     partial void DeleteTestRun_InspectTermApproveRecords(TestRun_InspectTermApproveRecords instance);
+    partial void InsertTestRun_MonthReport(TestRun_MonthReport instance);
+    partial void UpdateTestRun_MonthReport(TestRun_MonthReport instance);
+    partial void DeleteTestRun_MonthReport(TestRun_MonthReport instance);
+    partial void InsertTestRun_MonthReportItem(TestRun_MonthReportItem instance);
+    partial void UpdateTestRun_MonthReportItem(TestRun_MonthReportItem instance);
+    partial void DeleteTestRun_MonthReportItem(TestRun_MonthReportItem instance);
+    partial void InsertTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance);
+    partial void UpdateTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance);
+    partial void DeleteTestRun_MonthReportItem2(TestRun_MonthReportItem2 instance);
     partial void InsertTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance);
     partial void UpdateTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance);
     partial void DeleteTestRun_PersonTrainPlan(TestRun_PersonTrainPlan instance);
@@ -4103,6 +4124,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Comprehensive_ReviewDrawings> Comprehensive_ReviewDrawings
+		{
+			get
+			{
+				return this.GetTable<Comprehensive_ReviewDrawings>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Comprehensive_SiteVisaManagement> Comprehensive_SiteVisaManagement
 		{
 			get
@@ -5879,6 +5908,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Inspection_Test_Plan> Inspection_Test_Plan
+		{
+			get
+			{
+				return this.GetTable<Inspection_Test_Plan>();
+			}
+		}
+		
 		public System.Data.Linq.Table<InterFaceLog> InterFaceLog
 		{
 			get
@@ -7207,6 +7244,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<ProcessControl_NondestructiveTest_New> ProcessControl_NondestructiveTest_New
+		{
+			get
+			{
+				return this.GetTable<ProcessControl_NondestructiveTest_New>();
+			}
+		}
+		
 		public System.Data.Linq.Table<ProcessControl_TestPackageManagement> ProcessControl_TestPackageManagement
 		{
 			get
@@ -7735,6 +7780,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Report_Construction_Plan> Report_Construction_Plan
+		{
+			get
+			{
+				return this.GetTable<Report_Construction_Plan>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Report_ConstructionProblems> Report_ConstructionProblems
 		{
 			get
@@ -8671,6 +8724,30 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<TestRun_MonthReport> TestRun_MonthReport
+		{
+			get
+			{
+				return this.GetTable<TestRun_MonthReport>();
+			}
+		}
+		
+		public System.Data.Linq.Table<TestRun_MonthReportItem> TestRun_MonthReportItem
+		{
+			get
+			{
+				return this.GetTable<TestRun_MonthReportItem>();
+			}
+		}
+		
+		public System.Data.Linq.Table<TestRun_MonthReportItem2> TestRun_MonthReportItem2
+		{
+			get
+			{
+				return this.GetTable<TestRun_MonthReportItem2>();
+			}
+		}
+		
 		public System.Data.Linq.Table<TestRun_PersonTrainPlan> TestRun_PersonTrainPlan
 		{
 			get
@@ -26171,6 +26248,8 @@ namespace Model
 		
 		private EntitySet<Sys_UserRead> _Sys_UserRead;
 		
+		private EntitySet<TestRun_MonthReport> _TestRun_MonthReport;
+		
 		private EntitySet<TestRun_PersonTrainPlan> _TestRun_PersonTrainPlan;
 		
 		private EntitySet<TestRun_TrainContract> _TestRun_TrainContract;
@@ -26576,6 +26655,7 @@ namespace Model
 			this._Sys_RoleItem = new EntitySet<Sys_RoleItem>(new Action<Sys_RoleItem>(this.attach_Sys_RoleItem), new Action<Sys_RoleItem>(this.detach_Sys_RoleItem));
 			this._Sys_User = new EntitySet<Sys_User>(new Action<Sys_User>(this.attach_Sys_User), new Action<Sys_User>(this.detach_Sys_User));
 			this._Sys_UserRead = new EntitySet<Sys_UserRead>(new Action<Sys_UserRead>(this.attach_Sys_UserRead), new Action<Sys_UserRead>(this.detach_Sys_UserRead));
+			this._TestRun_MonthReport = new EntitySet<TestRun_MonthReport>(new Action<TestRun_MonthReport>(this.attach_TestRun_MonthReport), new Action<TestRun_MonthReport>(this.detach_TestRun_MonthReport));
 			this._TestRun_PersonTrainPlan = new EntitySet<TestRun_PersonTrainPlan>(new Action<TestRun_PersonTrainPlan>(this.attach_TestRun_PersonTrainPlan), new Action<TestRun_PersonTrainPlan>(this.detach_TestRun_PersonTrainPlan));
 			this._TestRun_TrainContract = new EntitySet<TestRun_TrainContract>(new Action<TestRun_TrainContract>(this.attach_TestRun_TrainContract), new Action<TestRun_TrainContract>(this.detach_TestRun_TrainContract));
 			this._TestRun_TrainRecords = new EntitySet<TestRun_TrainRecords>(new Action<TestRun_TrainRecords>(this.attach_TestRun_TrainRecords), new Action<TestRun_TrainRecords>(this.detach_TestRun_TrainRecords));
@@ -31000,6 +31080,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReport_Base_Project", Storage="_TestRun_MonthReport", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<TestRun_MonthReport> TestRun_MonthReport
+		{
+			get
+			{
+				return this._TestRun_MonthReport;
+			}
+			set
+			{
+				this._TestRun_MonthReport.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_PersonTrainPlan_Base_Project", Storage="_TestRun_PersonTrainPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<TestRun_PersonTrainPlan> TestRun_PersonTrainPlan
 		{
@@ -34558,6 +34651,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_TestRun_MonthReport(TestRun_MonthReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_TestRun_MonthReport(TestRun_MonthReport entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_TestRun_PersonTrainPlan(TestRun_PersonTrainPlan entity)
 		{
 			this.SendPropertyChanging();
@@ -95033,6 +95138,8 @@ namespace Model
 		
 		private string _UnitWorkId;
 		
+		private string _ExpertReviewMan;
+		
 		private EntityRef<Base_CNProfessional> _Base_CNProfessional;
 		
 		private EntityRef<Base_Project> _Base_Project;
@@ -95075,6 +95182,8 @@ namespace Model
     partial void OnCompileDateChanged();
     partial void OnUnitWorkIdChanging(string value);
     partial void OnUnitWorkIdChanged();
+    partial void OnExpertReviewManChanging(string value);
+    partial void OnExpertReviewManChanged();
     #endregion
 		
 		public Comprehensive_MajorPlanApproval()
@@ -95398,6 +95507,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ExpertReviewMan", DbType="NVarChar(200)")]
+		public string ExpertReviewMan
+		{
+			get
+			{
+				return this._ExpertReviewMan;
+			}
+			set
+			{
+				if ((this._ExpertReviewMan != value))
+				{
+					this.OnExpertReviewManChanging(value);
+					this.SendPropertyChanging();
+					this._ExpertReviewMan = value;
+					this.SendPropertyChanged("ExpertReviewMan");
+					this.OnExpertReviewManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_MajorPlanApproval_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
 		public Base_CNProfessional Base_CNProfessional
 		{
@@ -98200,6 +98329,308 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Comprehensive_ReviewDrawings")]
+	public partial class Comprehensive_ReviewDrawings : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _CNProfessionalId;
+		
+		private string _DraCode;
+		
+		private System.Nullable<System.DateTime> _ReviewDate;
+		
+		private string _UnitWorkId;
+		
+		private string _ReceiveUnits;
+		
+		private string _Status;
+		
+		private string _Remarks;
+		
+		private string _CreateMan;
+		
+		private System.Nullable<System.DateTime> _CreateDate;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnCNProfessionalIdChanging(string value);
+    partial void OnCNProfessionalIdChanged();
+    partial void OnDraCodeChanging(string value);
+    partial void OnDraCodeChanged();
+    partial void OnReviewDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnReviewDateChanged();
+    partial void OnUnitWorkIdChanging(string value);
+    partial void OnUnitWorkIdChanged();
+    partial void OnReceiveUnitsChanging(string value);
+    partial void OnReceiveUnitsChanged();
+    partial void OnStatusChanging(string value);
+    partial void OnStatusChanged();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
+    partial void OnCreateManChanging(string value);
+    partial void OnCreateManChanged();
+    partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateDateChanged();
+    #endregion
+		
+		public Comprehensive_ReviewDrawings()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
+		public string CNProfessionalId
+		{
+			get
+			{
+				return this._CNProfessionalId;
+			}
+			set
+			{
+				if ((this._CNProfessionalId != value))
+				{
+					this.OnCNProfessionalIdChanging(value);
+					this.SendPropertyChanging();
+					this._CNProfessionalId = value;
+					this.SendPropertyChanged("CNProfessionalId");
+					this.OnCNProfessionalIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")]
+		public string DraCode
+		{
+			get
+			{
+				return this._DraCode;
+			}
+			set
+			{
+				if ((this._DraCode != value))
+				{
+					this.OnDraCodeChanging(value);
+					this.SendPropertyChanging();
+					this._DraCode = value;
+					this.SendPropertyChanged("DraCode");
+					this.OnDraCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ReviewDate
+		{
+			get
+			{
+				return this._ReviewDate;
+			}
+			set
+			{
+				if ((this._ReviewDate != value))
+				{
+					this.OnReviewDateChanging(value);
+					this.SendPropertyChanging();
+					this._ReviewDate = value;
+					this.SendPropertyChanged("ReviewDate");
+					this.OnReviewDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorkId", DbType="NVarChar(500)")]
+		public string UnitWorkId
+		{
+			get
+			{
+				return this._UnitWorkId;
+			}
+			set
+			{
+				if ((this._UnitWorkId != value))
+				{
+					this.OnUnitWorkIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitWorkId = value;
+					this.SendPropertyChanged("UnitWorkId");
+					this.OnUnitWorkIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveUnits", DbType="NVarChar(800)")]
+		public string ReceiveUnits
+		{
+			get
+			{
+				return this._ReceiveUnits;
+			}
+			set
+			{
+				if ((this._ReceiveUnits != value))
+				{
+					this.OnReceiveUnitsChanging(value);
+					this.SendPropertyChanging();
+					this._ReceiveUnits = value;
+					this.SendPropertyChanged("ReceiveUnits");
+					this.OnReceiveUnitsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(2)")]
+		public string Status
+		{
+			get
+			{
+				return this._Status;
+			}
+			set
+			{
+				if ((this._Status != value))
+				{
+					this.OnStatusChanging(value);
+					this.SendPropertyChanging();
+					this._Status = value;
+					this.SendPropertyChanged("Status");
+					this.OnStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(500)")]
+		public string Remarks
+		{
+			get
+			{
+				return this._Remarks;
+			}
+			set
+			{
+				if ((this._Remarks != value))
+				{
+					this.OnRemarksChanging(value);
+					this.SendPropertyChanging();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")]
+		public string CreateMan
+		{
+			get
+			{
+				return this._CreateMan;
+			}
+			set
+			{
+				if ((this._CreateMan != value))
+				{
+					this.OnCreateManChanging(value);
+					this.SendPropertyChanging();
+					this._CreateMan = value;
+					this.SendPropertyChanged("CreateMan");
+					this.OnCreateManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreateDate
+		{
+			get
+			{
+				return this._CreateDate;
+			}
+			set
+			{
+				if ((this._CreateDate != value))
+				{
+					this.OnCreateDateChanging(value);
+					this.SendPropertyChanging();
+					this._CreateDate = value;
+					this.SendPropertyChanged("CreateDate");
+					this.OnCreateDateChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Comprehensive_SiteVisaManagement")]
 	public partial class Comprehensive_SiteVisaManagement : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -203776,6 +204207,332 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspection_Test_Plan")]
+	public partial class Inspection_Test_Plan : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _UnitId;
+		
+		private string _CNProfessionalId;
+		
+		private string _PlanCode;
+		
+		private string _PlanName;
+		
+		private System.Nullable<System.DateTime> _ApprovalDate;
+		
+		private string _AuditMan;
+		
+		private string _ApprovalMan;
+		
+		private string _Remarks;
+		
+		private string _CreateMan;
+		
+		private System.Nullable<System.DateTime> _CreateDate;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnCNProfessionalIdChanging(string value);
+    partial void OnCNProfessionalIdChanged();
+    partial void OnPlanCodeChanging(string value);
+    partial void OnPlanCodeChanged();
+    partial void OnPlanNameChanging(string value);
+    partial void OnPlanNameChanged();
+    partial void OnApprovalDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnApprovalDateChanged();
+    partial void OnAuditManChanging(string value);
+    partial void OnAuditManChanged();
+    partial void OnApprovalManChanging(string value);
+    partial void OnApprovalManChanged();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
+    partial void OnCreateManChanging(string value);
+    partial void OnCreateManChanged();
+    partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateDateChanged();
+    #endregion
+		
+		public Inspection_Test_Plan()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
+		public string CNProfessionalId
+		{
+			get
+			{
+				return this._CNProfessionalId;
+			}
+			set
+			{
+				if ((this._CNProfessionalId != value))
+				{
+					this.OnCNProfessionalIdChanging(value);
+					this.SendPropertyChanging();
+					this._CNProfessionalId = value;
+					this.SendPropertyChanged("CNProfessionalId");
+					this.OnCNProfessionalIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanCode", DbType="NVarChar(50)")]
+		public string PlanCode
+		{
+			get
+			{
+				return this._PlanCode;
+			}
+			set
+			{
+				if ((this._PlanCode != value))
+				{
+					this.OnPlanCodeChanging(value);
+					this.SendPropertyChanging();
+					this._PlanCode = value;
+					this.SendPropertyChanged("PlanCode");
+					this.OnPlanCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanName", DbType="NVarChar(50)")]
+		public string PlanName
+		{
+			get
+			{
+				return this._PlanName;
+			}
+			set
+			{
+				if ((this._PlanName != value))
+				{
+					this.OnPlanNameChanging(value);
+					this.SendPropertyChanging();
+					this._PlanName = value;
+					this.SendPropertyChanged("PlanName");
+					this.OnPlanNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovalDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ApprovalDate
+		{
+			get
+			{
+				return this._ApprovalDate;
+			}
+			set
+			{
+				if ((this._ApprovalDate != value))
+				{
+					this.OnApprovalDateChanging(value);
+					this.SendPropertyChanging();
+					this._ApprovalDate = value;
+					this.SendPropertyChanged("ApprovalDate");
+					this.OnApprovalDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan", DbType="NVarChar(50)")]
+		public string AuditMan
+		{
+			get
+			{
+				return this._AuditMan;
+			}
+			set
+			{
+				if ((this._AuditMan != value))
+				{
+					this.OnAuditManChanging(value);
+					this.SendPropertyChanging();
+					this._AuditMan = value;
+					this.SendPropertyChanged("AuditMan");
+					this.OnAuditManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovalMan", DbType="NVarChar(50)")]
+		public string ApprovalMan
+		{
+			get
+			{
+				return this._ApprovalMan;
+			}
+			set
+			{
+				if ((this._ApprovalMan != value))
+				{
+					this.OnApprovalManChanging(value);
+					this.SendPropertyChanging();
+					this._ApprovalMan = value;
+					this.SendPropertyChanged("ApprovalMan");
+					this.OnApprovalManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(50)")]
+		public string Remarks
+		{
+			get
+			{
+				return this._Remarks;
+			}
+			set
+			{
+				if ((this._Remarks != value))
+				{
+					this.OnRemarksChanging(value);
+					this.SendPropertyChanging();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")]
+		public string CreateMan
+		{
+			get
+			{
+				return this._CreateMan;
+			}
+			set
+			{
+				if ((this._CreateMan != value))
+				{
+					this.OnCreateManChanging(value);
+					this.SendPropertyChanging();
+					this._CreateMan = value;
+					this.SendPropertyChanged("CreateMan");
+					this.OnCreateManChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreateDate
+		{
+			get
+			{
+				return this._CreateDate;
+			}
+			set
+			{
+				if ((this._CreateDate != value))
+				{
+					this.OnCreateDateChanging(value);
+					this.SendPropertyChanging();
+					this._CreateDate = value;
+					this.SendPropertyChanged("CreateDate");
+					this.OnCreateDateChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.InterFaceLog")]
 	public partial class InterFaceLog : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -275778,6 +276535,284 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProcessControl_NondestructiveTest_New")]
+	public partial class ProcessControl_NondestructiveTest_New : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _UnitId;
+		
+		private string _ProfessionalName;
+		
+		private System.Nullable<int> _MonthQuantity;
+		
+		private System.Nullable<int> _TotalQuantity;
+		
+		private string _MonthRate;
+		
+		private string _TotalRate;
+		
+		private System.Nullable<System.DateTime> _CreateDate;
+		
+		private string _CreateMan;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnUnitIdChanging(string value);
+    partial void OnUnitIdChanged();
+    partial void OnProfessionalNameChanging(string value);
+    partial void OnProfessionalNameChanged();
+    partial void OnMonthQuantityChanging(System.Nullable<int> value);
+    partial void OnMonthQuantityChanged();
+    partial void OnTotalQuantityChanging(System.Nullable<int> value);
+    partial void OnTotalQuantityChanged();
+    partial void OnMonthRateChanging(string value);
+    partial void OnMonthRateChanged();
+    partial void OnTotalRateChanging(string value);
+    partial void OnTotalRateChanged();
+    partial void OnCreateDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreateDateChanged();
+    partial void OnCreateManChanging(string value);
+    partial void OnCreateManChanged();
+    #endregion
+		
+		public ProcessControl_NondestructiveTest_New()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this.OnUnitIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitId = value;
+					this.SendPropertyChanged("UnitId");
+					this.OnUnitIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProfessionalName", DbType="NVarChar(50)")]
+		public string ProfessionalName
+		{
+			get
+			{
+				return this._ProfessionalName;
+			}
+			set
+			{
+				if ((this._ProfessionalName != value))
+				{
+					this.OnProfessionalNameChanging(value);
+					this.SendPropertyChanging();
+					this._ProfessionalName = value;
+					this.SendPropertyChanged("ProfessionalName");
+					this.OnProfessionalNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthQuantity", DbType="Int")]
+		public System.Nullable<int> MonthQuantity
+		{
+			get
+			{
+				return this._MonthQuantity;
+			}
+			set
+			{
+				if ((this._MonthQuantity != value))
+				{
+					this.OnMonthQuantityChanging(value);
+					this.SendPropertyChanging();
+					this._MonthQuantity = value;
+					this.SendPropertyChanged("MonthQuantity");
+					this.OnMonthQuantityChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalQuantity", DbType="Int")]
+		public System.Nullable<int> TotalQuantity
+		{
+			get
+			{
+				return this._TotalQuantity;
+			}
+			set
+			{
+				if ((this._TotalQuantity != value))
+				{
+					this.OnTotalQuantityChanging(value);
+					this.SendPropertyChanging();
+					this._TotalQuantity = value;
+					this.SendPropertyChanged("TotalQuantity");
+					this.OnTotalQuantityChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthRate", DbType="NVarChar(50)")]
+		public string MonthRate
+		{
+			get
+			{
+				return this._MonthRate;
+			}
+			set
+			{
+				if ((this._MonthRate != value))
+				{
+					this.OnMonthRateChanging(value);
+					this.SendPropertyChanging();
+					this._MonthRate = value;
+					this.SendPropertyChanged("MonthRate");
+					this.OnMonthRateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalRate", DbType="NVarChar(50)")]
+		public string TotalRate
+		{
+			get
+			{
+				return this._TotalRate;
+			}
+			set
+			{
+				if ((this._TotalRate != value))
+				{
+					this.OnTotalRateChanging(value);
+					this.SendPropertyChanging();
+					this._TotalRate = value;
+					this.SendPropertyChanged("TotalRate");
+					this.OnTotalRateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreateDate
+		{
+			get
+			{
+				return this._CreateDate;
+			}
+			set
+			{
+				if ((this._CreateDate != value))
+				{
+					this.OnCreateDateChanging(value);
+					this.SendPropertyChanging();
+					this._CreateDate = value;
+					this.SendPropertyChanged("CreateDate");
+					this.OnCreateDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")]
+		public string CreateMan
+		{
+			get
+			{
+				return this._CreateMan;
+			}
+			set
+			{
+				if ((this._CreateMan != value))
+				{
+					this.OnCreateManChanging(value);
+					this.SendPropertyChanging();
+					this._CreateMan = value;
+					this.SendPropertyChanged("CreateMan");
+					this.OnCreateManChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.ProcessControl_TestPackageManagement")]
 	public partial class ProcessControl_TestPackageManagement : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -304947,6 +305982,260 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_Construction_Plan")]
+	public partial class Report_Construction_Plan : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ReportId;
+		
+		private string _ReType;
+		
+		private string _UnitOrMajor;
+		
+		private System.Nullable<int> _Quantity1;
+		
+		private System.Nullable<int> _Quantity2;
+		
+		private System.Nullable<int> _Quantity3;
+		
+		private string _Remarks;
+		
+		private string _QuaRate;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnReportIdChanging(string value);
+    partial void OnReportIdChanged();
+    partial void OnReTypeChanging(string value);
+    partial void OnReTypeChanged();
+    partial void OnUnitOrMajorChanging(string value);
+    partial void OnUnitOrMajorChanged();
+    partial void OnQuantity1Changing(System.Nullable<int> value);
+    partial void OnQuantity1Changed();
+    partial void OnQuantity2Changing(System.Nullable<int> value);
+    partial void OnQuantity2Changed();
+    partial void OnQuantity3Changing(System.Nullable<int> value);
+    partial void OnQuantity3Changed();
+    partial void OnRemarksChanging(string value);
+    partial void OnRemarksChanged();
+    partial void OnQuaRateChanging(string value);
+    partial void OnQuaRateChanged();
+    #endregion
+		
+		public Report_Construction_Plan()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportId", DbType="NVarChar(50)")]
+		public string ReportId
+		{
+			get
+			{
+				return this._ReportId;
+			}
+			set
+			{
+				if ((this._ReportId != value))
+				{
+					this.OnReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._ReportId = value;
+					this.SendPropertyChanged("ReportId");
+					this.OnReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReType", DbType="NVarChar(20)")]
+		public string ReType
+		{
+			get
+			{
+				return this._ReType;
+			}
+			set
+			{
+				if ((this._ReType != value))
+				{
+					this.OnReTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ReType = value;
+					this.SendPropertyChanged("ReType");
+					this.OnReTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitOrMajor", DbType="NVarChar(200)")]
+		public string UnitOrMajor
+		{
+			get
+			{
+				return this._UnitOrMajor;
+			}
+			set
+			{
+				if ((this._UnitOrMajor != value))
+				{
+					this.OnUnitOrMajorChanging(value);
+					this.SendPropertyChanging();
+					this._UnitOrMajor = value;
+					this.SendPropertyChanged("UnitOrMajor");
+					this.OnUnitOrMajorChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity1", DbType="Int")]
+		public System.Nullable<int> Quantity1
+		{
+			get
+			{
+				return this._Quantity1;
+			}
+			set
+			{
+				if ((this._Quantity1 != value))
+				{
+					this.OnQuantity1Changing(value);
+					this.SendPropertyChanging();
+					this._Quantity1 = value;
+					this.SendPropertyChanged("Quantity1");
+					this.OnQuantity1Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity2", DbType="Int")]
+		public System.Nullable<int> Quantity2
+		{
+			get
+			{
+				return this._Quantity2;
+			}
+			set
+			{
+				if ((this._Quantity2 != value))
+				{
+					this.OnQuantity2Changing(value);
+					this.SendPropertyChanging();
+					this._Quantity2 = value;
+					this.SendPropertyChanged("Quantity2");
+					this.OnQuantity2Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity3", DbType="Int")]
+		public System.Nullable<int> Quantity3
+		{
+			get
+			{
+				return this._Quantity3;
+			}
+			set
+			{
+				if ((this._Quantity3 != value))
+				{
+					this.OnQuantity3Changing(value);
+					this.SendPropertyChanging();
+					this._Quantity3 = value;
+					this.SendPropertyChanged("Quantity3");
+					this.OnQuantity3Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(200)")]
+		public string Remarks
+		{
+			get
+			{
+				return this._Remarks;
+			}
+			set
+			{
+				if ((this._Remarks != value))
+				{
+					this.OnRemarksChanging(value);
+					this.SendPropertyChanging();
+					this._Remarks = value;
+					this.SendPropertyChanged("Remarks");
+					this.OnRemarksChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuaRate", DbType="NVarChar(50)")]
+		public string QuaRate
+		{
+			get
+			{
+				return this._QuaRate;
+			}
+			set
+			{
+				if ((this._QuaRate != value))
+				{
+					this.OnQuaRateChanging(value);
+					this.SendPropertyChanging();
+					this._QuaRate = value;
+					this.SendPropertyChanged("QuaRate");
+					this.OnQuaRateChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Report_ConstructionProblems")]
 	public partial class Report_ConstructionProblems : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -361646,6 +362935,1451 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReport")]
+	public partial class TestRun_MonthReport : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _MonthReportId;
+		
+		private string _ProjectId;
+		
+		private string _MonthReportCode;
+		
+		private System.Nullable<System.DateTime> _MonthReportDate;
+		
+		private string _ProjectOverview;
+		
+		private string _ProjectBaseInfo;
+		
+		private string _EngineeringPlant;
+		
+		private string _ProjectContract;
+		
+		private string _Milestone;
+		
+		private string _CompleteWork;
+		
+		private string _ProblemSituation;
+		
+		private System.Nullable<decimal> _Budget;
+		
+		private System.Nullable<decimal> _BudgetTotal;
+		
+		private System.Nullable<decimal> _ActualCost;
+		
+		private System.Nullable<decimal> _ActualCostTotal;
+		
+		private string _PublicationStatus;
+		
+		private string _ImplementationStatus;
+		
+		private string _HSEManageSituation;
+		
+		private string _NextMonthMilestone;
+		
+		private string _NextMonthCompleteWork;
+		
+		private string _NextMonthSchedule;
+		
+		private string _NextMonthDrivingCost;
+		
+		private string _ProblemsMeasures;
+		
+		private string _SolvedProblems;
+		
+		private string _PushPerson;
+		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntitySet<TestRun_MonthReportItem> _TestRun_MonthReportItem;
+		
+		private EntitySet<TestRun_MonthReportItem2> _TestRun_MonthReportItem2;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnMonthReportIdChanging(string value);
+    partial void OnMonthReportIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnMonthReportCodeChanging(string value);
+    partial void OnMonthReportCodeChanged();
+    partial void OnMonthReportDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnMonthReportDateChanged();
+    partial void OnProjectOverviewChanging(string value);
+    partial void OnProjectOverviewChanged();
+    partial void OnProjectBaseInfoChanging(string value);
+    partial void OnProjectBaseInfoChanged();
+    partial void OnEngineeringPlantChanging(string value);
+    partial void OnEngineeringPlantChanged();
+    partial void OnProjectContractChanging(string value);
+    partial void OnProjectContractChanged();
+    partial void OnMilestoneChanging(string value);
+    partial void OnMilestoneChanged();
+    partial void OnCompleteWorkChanging(string value);
+    partial void OnCompleteWorkChanged();
+    partial void OnProblemSituationChanging(string value);
+    partial void OnProblemSituationChanged();
+    partial void OnBudgetChanging(System.Nullable<decimal> value);
+    partial void OnBudgetChanged();
+    partial void OnBudgetTotalChanging(System.Nullable<decimal> value);
+    partial void OnBudgetTotalChanged();
+    partial void OnActualCostChanging(System.Nullable<decimal> value);
+    partial void OnActualCostChanged();
+    partial void OnActualCostTotalChanging(System.Nullable<decimal> value);
+    partial void OnActualCostTotalChanged();
+    partial void OnPublicationStatusChanging(string value);
+    partial void OnPublicationStatusChanged();
+    partial void OnImplementationStatusChanging(string value);
+    partial void OnImplementationStatusChanged();
+    partial void OnHSEManageSituationChanging(string value);
+    partial void OnHSEManageSituationChanged();
+    partial void OnNextMonthMilestoneChanging(string value);
+    partial void OnNextMonthMilestoneChanged();
+    partial void OnNextMonthCompleteWorkChanging(string value);
+    partial void OnNextMonthCompleteWorkChanged();
+    partial void OnNextMonthScheduleChanging(string value);
+    partial void OnNextMonthScheduleChanged();
+    partial void OnNextMonthDrivingCostChanging(string value);
+    partial void OnNextMonthDrivingCostChanged();
+    partial void OnProblemsMeasuresChanging(string value);
+    partial void OnProblemsMeasuresChanged();
+    partial void OnSolvedProblemsChanging(string value);
+    partial void OnSolvedProblemsChanged();
+    partial void OnPushPersonChanging(string value);
+    partial void OnPushPersonChanged();
+    #endregion
+		
+		public TestRun_MonthReport()
+		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._TestRun_MonthReportItem = new EntitySet<TestRun_MonthReportItem>(new Action<TestRun_MonthReportItem>(this.attach_TestRun_MonthReportItem), new Action<TestRun_MonthReportItem>(this.detach_TestRun_MonthReportItem));
+			this._TestRun_MonthReportItem2 = new EntitySet<TestRun_MonthReportItem2>(new Action<TestRun_MonthReportItem2>(this.attach_TestRun_MonthReportItem2), new Action<TestRun_MonthReportItem2>(this.detach_TestRun_MonthReportItem2));
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string MonthReportId
+		{
+			get
+			{
+				return this._MonthReportId;
+			}
+			set
+			{
+				if ((this._MonthReportId != value))
+				{
+					this.OnMonthReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportId = value;
+					this.SendPropertyChanged("MonthReportId");
+					this.OnMonthReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportCode", DbType="NVarChar(50)")]
+		public string MonthReportCode
+		{
+			get
+			{
+				return this._MonthReportCode;
+			}
+			set
+			{
+				if ((this._MonthReportCode != value))
+				{
+					this.OnMonthReportCodeChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportCode = value;
+					this.SendPropertyChanged("MonthReportCode");
+					this.OnMonthReportCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> MonthReportDate
+		{
+			get
+			{
+				return this._MonthReportDate;
+			}
+			set
+			{
+				if ((this._MonthReportDate != value))
+				{
+					this.OnMonthReportDateChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportDate = value;
+					this.SendPropertyChanged("MonthReportDate");
+					this.OnMonthReportDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectOverview", DbType="NVarChar(1000)")]
+		public string ProjectOverview
+		{
+			get
+			{
+				return this._ProjectOverview;
+			}
+			set
+			{
+				if ((this._ProjectOverview != value))
+				{
+					this.OnProjectOverviewChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectOverview = value;
+					this.SendPropertyChanged("ProjectOverview");
+					this.OnProjectOverviewChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectBaseInfo", DbType="NVarChar(2000)")]
+		public string ProjectBaseInfo
+		{
+			get
+			{
+				return this._ProjectBaseInfo;
+			}
+			set
+			{
+				if ((this._ProjectBaseInfo != value))
+				{
+					this.OnProjectBaseInfoChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectBaseInfo = value;
+					this.SendPropertyChanged("ProjectBaseInfo");
+					this.OnProjectBaseInfoChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EngineeringPlant", DbType="NVarChar(2000)")]
+		public string EngineeringPlant
+		{
+			get
+			{
+				return this._EngineeringPlant;
+			}
+			set
+			{
+				if ((this._EngineeringPlant != value))
+				{
+					this.OnEngineeringPlantChanging(value);
+					this.SendPropertyChanging();
+					this._EngineeringPlant = value;
+					this.SendPropertyChanged("EngineeringPlant");
+					this.OnEngineeringPlantChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectContract", DbType="NVarChar(2000)")]
+		public string ProjectContract
+		{
+			get
+			{
+				return this._ProjectContract;
+			}
+			set
+			{
+				if ((this._ProjectContract != value))
+				{
+					this.OnProjectContractChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectContract = value;
+					this.SendPropertyChanged("ProjectContract");
+					this.OnProjectContractChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Milestone", DbType="NVarChar(1000)")]
+		public string Milestone
+		{
+			get
+			{
+				return this._Milestone;
+			}
+			set
+			{
+				if ((this._Milestone != value))
+				{
+					this.OnMilestoneChanging(value);
+					this.SendPropertyChanging();
+					this._Milestone = value;
+					this.SendPropertyChanged("Milestone");
+					this.OnMilestoneChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteWork", DbType="NVarChar(1000)")]
+		public string CompleteWork
+		{
+			get
+			{
+				return this._CompleteWork;
+			}
+			set
+			{
+				if ((this._CompleteWork != value))
+				{
+					this.OnCompleteWorkChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteWork = value;
+					this.SendPropertyChanged("CompleteWork");
+					this.OnCompleteWorkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemSituation", DbType="NVarChar(1000)")]
+		public string ProblemSituation
+		{
+			get
+			{
+				return this._ProblemSituation;
+			}
+			set
+			{
+				if ((this._ProblemSituation != value))
+				{
+					this.OnProblemSituationChanging(value);
+					this.SendPropertyChanging();
+					this._ProblemSituation = value;
+					this.SendPropertyChanged("ProblemSituation");
+					this.OnProblemSituationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Budget", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> Budget
+		{
+			get
+			{
+				return this._Budget;
+			}
+			set
+			{
+				if ((this._Budget != value))
+				{
+					this.OnBudgetChanging(value);
+					this.SendPropertyChanging();
+					this._Budget = value;
+					this.SendPropertyChanged("Budget");
+					this.OnBudgetChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BudgetTotal", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> BudgetTotal
+		{
+			get
+			{
+				return this._BudgetTotal;
+			}
+			set
+			{
+				if ((this._BudgetTotal != value))
+				{
+					this.OnBudgetTotalChanging(value);
+					this.SendPropertyChanging();
+					this._BudgetTotal = value;
+					this.SendPropertyChanged("BudgetTotal");
+					this.OnBudgetTotalChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualCost", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> ActualCost
+		{
+			get
+			{
+				return this._ActualCost;
+			}
+			set
+			{
+				if ((this._ActualCost != value))
+				{
+					this.OnActualCostChanging(value);
+					this.SendPropertyChanging();
+					this._ActualCost = value;
+					this.SendPropertyChanged("ActualCost");
+					this.OnActualCostChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActualCostTotal", DbType="Decimal(18,2)")]
+		public System.Nullable<decimal> ActualCostTotal
+		{
+			get
+			{
+				return this._ActualCostTotal;
+			}
+			set
+			{
+				if ((this._ActualCostTotal != value))
+				{
+					this.OnActualCostTotalChanging(value);
+					this.SendPropertyChanging();
+					this._ActualCostTotal = value;
+					this.SendPropertyChanged("ActualCostTotal");
+					this.OnActualCostTotalChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PublicationStatus", DbType="NVarChar(500)")]
+		public string PublicationStatus
+		{
+			get
+			{
+				return this._PublicationStatus;
+			}
+			set
+			{
+				if ((this._PublicationStatus != value))
+				{
+					this.OnPublicationStatusChanging(value);
+					this.SendPropertyChanging();
+					this._PublicationStatus = value;
+					this.SendPropertyChanged("PublicationStatus");
+					this.OnPublicationStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")]
+		public string ImplementationStatus
+		{
+			get
+			{
+				return this._ImplementationStatus;
+			}
+			set
+			{
+				if ((this._ImplementationStatus != value))
+				{
+					this.OnImplementationStatusChanging(value);
+					this.SendPropertyChanging();
+					this._ImplementationStatus = value;
+					this.SendPropertyChanged("ImplementationStatus");
+					this.OnImplementationStatusChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HSEManageSituation", DbType="NVarChar(500)")]
+		public string HSEManageSituation
+		{
+			get
+			{
+				return this._HSEManageSituation;
+			}
+			set
+			{
+				if ((this._HSEManageSituation != value))
+				{
+					this.OnHSEManageSituationChanging(value);
+					this.SendPropertyChanging();
+					this._HSEManageSituation = value;
+					this.SendPropertyChanged("HSEManageSituation");
+					this.OnHSEManageSituationChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthMilestone", DbType="NVarChar(1000)")]
+		public string NextMonthMilestone
+		{
+			get
+			{
+				return this._NextMonthMilestone;
+			}
+			set
+			{
+				if ((this._NextMonthMilestone != value))
+				{
+					this.OnNextMonthMilestoneChanging(value);
+					this.SendPropertyChanging();
+					this._NextMonthMilestone = value;
+					this.SendPropertyChanged("NextMonthMilestone");
+					this.OnNextMonthMilestoneChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthCompleteWork", DbType="NVarChar(1000)")]
+		public string NextMonthCompleteWork
+		{
+			get
+			{
+				return this._NextMonthCompleteWork;
+			}
+			set
+			{
+				if ((this._NextMonthCompleteWork != value))
+				{
+					this.OnNextMonthCompleteWorkChanging(value);
+					this.SendPropertyChanging();
+					this._NextMonthCompleteWork = value;
+					this.SendPropertyChanged("NextMonthCompleteWork");
+					this.OnNextMonthCompleteWorkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthSchedule", DbType="NVarChar(1000)")]
+		public string NextMonthSchedule
+		{
+			get
+			{
+				return this._NextMonthSchedule;
+			}
+			set
+			{
+				if ((this._NextMonthSchedule != value))
+				{
+					this.OnNextMonthScheduleChanging(value);
+					this.SendPropertyChanging();
+					this._NextMonthSchedule = value;
+					this.SendPropertyChanged("NextMonthSchedule");
+					this.OnNextMonthScheduleChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NextMonthDrivingCost", DbType="NVarChar(1000)")]
+		public string NextMonthDrivingCost
+		{
+			get
+			{
+				return this._NextMonthDrivingCost;
+			}
+			set
+			{
+				if ((this._NextMonthDrivingCost != value))
+				{
+					this.OnNextMonthDrivingCostChanging(value);
+					this.SendPropertyChanging();
+					this._NextMonthDrivingCost = value;
+					this.SendPropertyChanged("NextMonthDrivingCost");
+					this.OnNextMonthDrivingCostChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProblemsMeasures", DbType="NVarChar(2000)")]
+		public string ProblemsMeasures
+		{
+			get
+			{
+				return this._ProblemsMeasures;
+			}
+			set
+			{
+				if ((this._ProblemsMeasures != value))
+				{
+					this.OnProblemsMeasuresChanging(value);
+					this.SendPropertyChanging();
+					this._ProblemsMeasures = value;
+					this.SendPropertyChanged("ProblemsMeasures");
+					this.OnProblemsMeasuresChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SolvedProblems", DbType="NVarChar(2000)")]
+		public string SolvedProblems
+		{
+			get
+			{
+				return this._SolvedProblems;
+			}
+			set
+			{
+				if ((this._SolvedProblems != value))
+				{
+					this.OnSolvedProblemsChanging(value);
+					this.SendPropertyChanging();
+					this._SolvedProblems = value;
+					this.SendPropertyChanged("SolvedProblems");
+					this.OnSolvedProblemsChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PushPerson", DbType="NVarChar(1000)")]
+		public string PushPerson
+		{
+			get
+			{
+				return this._PushPerson;
+			}
+			set
+			{
+				if ((this._PushPerson != value))
+				{
+					this.OnPushPersonChanging(value);
+					this.SendPropertyChanging();
+					this._PushPerson = value;
+					this.SendPropertyChanged("PushPerson");
+					this.OnPushPersonChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReport_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.TestRun_MonthReport.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.TestRun_MonthReport.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem_TestRun_MonthReport", Storage="_TestRun_MonthReportItem", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
+		public EntitySet<TestRun_MonthReportItem> TestRun_MonthReportItem
+		{
+			get
+			{
+				return this._TestRun_MonthReportItem;
+			}
+			set
+			{
+				this._TestRun_MonthReportItem.Assign(value);
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem2_TestRun_MonthReport", Storage="_TestRun_MonthReportItem2", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
+		public EntitySet<TestRun_MonthReportItem2> TestRun_MonthReportItem2
+		{
+			get
+			{
+				return this._TestRun_MonthReportItem2;
+			}
+			set
+			{
+				this._TestRun_MonthReportItem2.Assign(value);
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+		
+		private void attach_TestRun_MonthReportItem(TestRun_MonthReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.TestRun_MonthReport = this;
+		}
+		
+		private void detach_TestRun_MonthReportItem(TestRun_MonthReportItem entity)
+		{
+			this.SendPropertyChanging();
+			entity.TestRun_MonthReport = null;
+		}
+		
+		private void attach_TestRun_MonthReportItem2(TestRun_MonthReportItem2 entity)
+		{
+			this.SendPropertyChanging();
+			entity.TestRun_MonthReport = this;
+		}
+		
+		private void detach_TestRun_MonthReportItem2(TestRun_MonthReportItem2 entity)
+		{
+			this.SendPropertyChanging();
+			entity.TestRun_MonthReport = null;
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReportItem")]
+	public partial class TestRun_MonthReportItem : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _MonthReportItemId;
+		
+		private string _MonthReportId;
+		
+		private string _SortIndex;
+		
+		private string _WorkPackageType;
+		
+		private string _Unit;
+		
+		private System.Nullable<int> _DesignCount;
+		
+		private System.Nullable<int> _MonthPlan;
+		
+		private string _MonthActual;
+		
+		private System.Nullable<int> _TotalPlan;
+		
+		private System.Nullable<int> _TatalActual;
+		
+		private string _CompletionRate;
+		
+		private EntityRef<TestRun_MonthReport> _TestRun_MonthReport;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnMonthReportItemIdChanging(string value);
+    partial void OnMonthReportItemIdChanged();
+    partial void OnMonthReportIdChanging(string value);
+    partial void OnMonthReportIdChanged();
+    partial void OnSortIndexChanging(string value);
+    partial void OnSortIndexChanged();
+    partial void OnWorkPackageTypeChanging(string value);
+    partial void OnWorkPackageTypeChanged();
+    partial void OnUnitChanging(string value);
+    partial void OnUnitChanged();
+    partial void OnDesignCountChanging(System.Nullable<int> value);
+    partial void OnDesignCountChanged();
+    partial void OnMonthPlanChanging(System.Nullable<int> value);
+    partial void OnMonthPlanChanged();
+    partial void OnMonthActualChanging(string value);
+    partial void OnMonthActualChanged();
+    partial void OnTotalPlanChanging(System.Nullable<int> value);
+    partial void OnTotalPlanChanged();
+    partial void OnTatalActualChanging(System.Nullable<int> value);
+    partial void OnTatalActualChanged();
+    partial void OnCompletionRateChanging(string value);
+    partial void OnCompletionRateChanged();
+    #endregion
+		
+		public TestRun_MonthReportItem()
+		{
+			this._TestRun_MonthReport = default(EntityRef<TestRun_MonthReport>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string MonthReportItemId
+		{
+			get
+			{
+				return this._MonthReportItemId;
+			}
+			set
+			{
+				if ((this._MonthReportItemId != value))
+				{
+					this.OnMonthReportItemIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportItemId = value;
+					this.SendPropertyChanged("MonthReportItemId");
+					this.OnMonthReportItemIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
+		public string MonthReportId
+		{
+			get
+			{
+				return this._MonthReportId;
+			}
+			set
+			{
+				if ((this._MonthReportId != value))
+				{
+					if (this._TestRun_MonthReport.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnMonthReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportId = value;
+					this.SendPropertyChanged("MonthReportId");
+					this.OnMonthReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="NChar(10)")]
+		public string SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageType", DbType="NVarChar(50)")]
+		public string WorkPackageType
+		{
+			get
+			{
+				return this._WorkPackageType;
+			}
+			set
+			{
+				if ((this._WorkPackageType != value))
+				{
+					this.OnWorkPackageTypeChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageType = value;
+					this.SendPropertyChanged("WorkPackageType");
+					this.OnWorkPackageTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NChar(10)")]
+		public string Unit
+		{
+			get
+			{
+				return this._Unit;
+			}
+			set
+			{
+				if ((this._Unit != value))
+				{
+					this.OnUnitChanging(value);
+					this.SendPropertyChanging();
+					this._Unit = value;
+					this.SendPropertyChanged("Unit");
+					this.OnUnitChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignCount", DbType="Int")]
+		public System.Nullable<int> DesignCount
+		{
+			get
+			{
+				return this._DesignCount;
+			}
+			set
+			{
+				if ((this._DesignCount != value))
+				{
+					this.OnDesignCountChanging(value);
+					this.SendPropertyChanging();
+					this._DesignCount = value;
+					this.SendPropertyChanged("DesignCount");
+					this.OnDesignCountChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthPlan", DbType="Int")]
+		public System.Nullable<int> MonthPlan
+		{
+			get
+			{
+				return this._MonthPlan;
+			}
+			set
+			{
+				if ((this._MonthPlan != value))
+				{
+					this.OnMonthPlanChanging(value);
+					this.SendPropertyChanging();
+					this._MonthPlan = value;
+					this.SendPropertyChanged("MonthPlan");
+					this.OnMonthPlanChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthActual", DbType="NVarChar(50)")]
+		public string MonthActual
+		{
+			get
+			{
+				return this._MonthActual;
+			}
+			set
+			{
+				if ((this._MonthActual != value))
+				{
+					this.OnMonthActualChanging(value);
+					this.SendPropertyChanging();
+					this._MonthActual = value;
+					this.SendPropertyChanged("MonthActual");
+					this.OnMonthActualChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalPlan", DbType="Int")]
+		public System.Nullable<int> TotalPlan
+		{
+			get
+			{
+				return this._TotalPlan;
+			}
+			set
+			{
+				if ((this._TotalPlan != value))
+				{
+					this.OnTotalPlanChanging(value);
+					this.SendPropertyChanging();
+					this._TotalPlan = value;
+					this.SendPropertyChanged("TotalPlan");
+					this.OnTotalPlanChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TatalActual", DbType="Int")]
+		public System.Nullable<int> TatalActual
+		{
+			get
+			{
+				return this._TatalActual;
+			}
+			set
+			{
+				if ((this._TatalActual != value))
+				{
+					this.OnTatalActualChanging(value);
+					this.SendPropertyChanging();
+					this._TatalActual = value;
+					this.SendPropertyChanged("TatalActual");
+					this.OnTatalActualChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletionRate", DbType="NVarChar(50)")]
+		public string CompletionRate
+		{
+			get
+			{
+				return this._CompletionRate;
+			}
+			set
+			{
+				if ((this._CompletionRate != value))
+				{
+					this.OnCompletionRateChanging(value);
+					this.SendPropertyChanging();
+					this._CompletionRate = value;
+					this.SendPropertyChanged("CompletionRate");
+					this.OnCompletionRateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem_TestRun_MonthReport", Storage="_TestRun_MonthReport", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
+		public TestRun_MonthReport TestRun_MonthReport
+		{
+			get
+			{
+				return this._TestRun_MonthReport.Entity;
+			}
+			set
+			{
+				TestRun_MonthReport previousValue = this._TestRun_MonthReport.Entity;
+				if (((previousValue != value) 
+							|| (this._TestRun_MonthReport.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._TestRun_MonthReport.Entity = null;
+						previousValue.TestRun_MonthReportItem.Remove(this);
+					}
+					this._TestRun_MonthReport.Entity = value;
+					if ((value != null))
+					{
+						value.TestRun_MonthReportItem.Add(this);
+						this._MonthReportId = value.MonthReportId;
+					}
+					else
+					{
+						this._MonthReportId = default(string);
+					}
+					this.SendPropertyChanged("TestRun_MonthReport");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_MonthReportItem2")]
+	public partial class TestRun_MonthReportItem2 : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _MonthReportItem2Id;
+		
+		private string _MonthReportId;
+		
+		private string _ReportType;
+		
+		private string _TypeName;
+		
+		private string _PV;
+		
+		private string _EV;
+		
+		private string _AC;
+		
+		private string _CV;
+		
+		private string _SV;
+		
+		private string _CPI;
+		
+		private string _SPI;
+		
+		private System.Nullable<int> _SortIndex;
+		
+		private EntityRef<TestRun_MonthReport> _TestRun_MonthReport;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnMonthReportItem2IdChanging(string value);
+    partial void OnMonthReportItem2IdChanged();
+    partial void OnMonthReportIdChanging(string value);
+    partial void OnMonthReportIdChanged();
+    partial void OnReportTypeChanging(string value);
+    partial void OnReportTypeChanged();
+    partial void OnTypeNameChanging(string value);
+    partial void OnTypeNameChanged();
+    partial void OnPVChanging(string value);
+    partial void OnPVChanged();
+    partial void OnEVChanging(string value);
+    partial void OnEVChanged();
+    partial void OnACChanging(string value);
+    partial void OnACChanged();
+    partial void OnCVChanging(string value);
+    partial void OnCVChanged();
+    partial void OnSVChanging(string value);
+    partial void OnSVChanged();
+    partial void OnCPIChanging(string value);
+    partial void OnCPIChanged();
+    partial void OnSPIChanging(string value);
+    partial void OnSPIChanged();
+    partial void OnSortIndexChanging(System.Nullable<int> value);
+    partial void OnSortIndexChanged();
+    #endregion
+		
+		public TestRun_MonthReportItem2()
+		{
+			this._TestRun_MonthReport = default(EntityRef<TestRun_MonthReport>);
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportItem2Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string MonthReportItem2Id
+		{
+			get
+			{
+				return this._MonthReportItem2Id;
+			}
+			set
+			{
+				if ((this._MonthReportItem2Id != value))
+				{
+					this.OnMonthReportItem2IdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportItem2Id = value;
+					this.SendPropertyChanged("MonthReportItem2Id");
+					this.OnMonthReportItem2IdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
+		public string MonthReportId
+		{
+			get
+			{
+				return this._MonthReportId;
+			}
+			set
+			{
+				if ((this._MonthReportId != value))
+				{
+					if (this._TestRun_MonthReport.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
+					this.OnMonthReportIdChanging(value);
+					this.SendPropertyChanging();
+					this._MonthReportId = value;
+					this.SendPropertyChanged("MonthReportId");
+					this.OnMonthReportIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReportType", DbType="NVarChar(50)")]
+		public string ReportType
+		{
+			get
+			{
+				return this._ReportType;
+			}
+			set
+			{
+				if ((this._ReportType != value))
+				{
+					this.OnReportTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ReportType = value;
+					this.SendPropertyChanged("ReportType");
+					this.OnReportTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeName", DbType="NVarChar(50)")]
+		public string TypeName
+		{
+			get
+			{
+				return this._TypeName;
+			}
+			set
+			{
+				if ((this._TypeName != value))
+				{
+					this.OnTypeNameChanging(value);
+					this.SendPropertyChanging();
+					this._TypeName = value;
+					this.SendPropertyChanged("TypeName");
+					this.OnTypeNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PV", DbType="NVarChar(50)")]
+		public string PV
+		{
+			get
+			{
+				return this._PV;
+			}
+			set
+			{
+				if ((this._PV != value))
+				{
+					this.OnPVChanging(value);
+					this.SendPropertyChanging();
+					this._PV = value;
+					this.SendPropertyChanged("PV");
+					this.OnPVChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EV", DbType="NVarChar(50)")]
+		public string EV
+		{
+			get
+			{
+				return this._EV;
+			}
+			set
+			{
+				if ((this._EV != value))
+				{
+					this.OnEVChanging(value);
+					this.SendPropertyChanging();
+					this._EV = value;
+					this.SendPropertyChanged("EV");
+					this.OnEVChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AC", DbType="NVarChar(50)")]
+		public string AC
+		{
+			get
+			{
+				return this._AC;
+			}
+			set
+			{
+				if ((this._AC != value))
+				{
+					this.OnACChanging(value);
+					this.SendPropertyChanging();
+					this._AC = value;
+					this.SendPropertyChanged("AC");
+					this.OnACChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CV", DbType="NVarChar(50)")]
+		public string CV
+		{
+			get
+			{
+				return this._CV;
+			}
+			set
+			{
+				if ((this._CV != value))
+				{
+					this.OnCVChanging(value);
+					this.SendPropertyChanging();
+					this._CV = value;
+					this.SendPropertyChanged("CV");
+					this.OnCVChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SV", DbType="NVarChar(50)")]
+		public string SV
+		{
+			get
+			{
+				return this._SV;
+			}
+			set
+			{
+				if ((this._SV != value))
+				{
+					this.OnSVChanging(value);
+					this.SendPropertyChanging();
+					this._SV = value;
+					this.SendPropertyChanged("SV");
+					this.OnSVChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CPI", DbType="NVarChar(50)")]
+		public string CPI
+		{
+			get
+			{
+				return this._CPI;
+			}
+			set
+			{
+				if ((this._CPI != value))
+				{
+					this.OnCPIChanging(value);
+					this.SendPropertyChanging();
+					this._CPI = value;
+					this.SendPropertyChanged("CPI");
+					this.OnCPIChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SPI", DbType="NVarChar(50)")]
+		public string SPI
+		{
+			get
+			{
+				return this._SPI;
+			}
+			set
+			{
+				if ((this._SPI != value))
+				{
+					this.OnSPIChanging(value);
+					this.SendPropertyChanging();
+					this._SPI = value;
+					this.SendPropertyChanged("SPI");
+					this.OnSPIChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")]
+		public System.Nullable<int> SortIndex
+		{
+			get
+			{
+				return this._SortIndex;
+			}
+			set
+			{
+				if ((this._SortIndex != value))
+				{
+					this.OnSortIndexChanging(value);
+					this.SendPropertyChanging();
+					this._SortIndex = value;
+					this.SendPropertyChanged("SortIndex");
+					this.OnSortIndexChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_TestRun_MonthReportItem2_TestRun_MonthReport", Storage="_TestRun_MonthReport", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
+		public TestRun_MonthReport TestRun_MonthReport
+		{
+			get
+			{
+				return this._TestRun_MonthReport.Entity;
+			}
+			set
+			{
+				TestRun_MonthReport previousValue = this._TestRun_MonthReport.Entity;
+				if (((previousValue != value) 
+							|| (this._TestRun_MonthReport.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._TestRun_MonthReport.Entity = null;
+						previousValue.TestRun_MonthReportItem2.Remove(this);
+					}
+					this._TestRun_MonthReport.Entity = value;
+					if ((value != null))
+					{
+						value.TestRun_MonthReportItem2.Add(this);
+						this._MonthReportId = value.MonthReportId;
+					}
+					else
+					{
+						this._MonthReportId = default(string);
+					}
+					this.SendPropertyChanged("TestRun_MonthReport");
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.TestRun_PersonTrainPlan")]
 	public partial class TestRun_PersonTrainPlan : INotifyPropertyChanging, INotifyPropertyChanged
 	{