DataBase/版本日志/SGGLDB_WH_2024-04-10-bwj.sql

@@ -1,32 +0,0 @@
-
-update Sys_Menu set IsUsed=0 where MenuId='6549EF60-1DED-4912-8D2D-7B32A80A2DEC'--视频会议
-go
-update Sys_Menu set MenuName='项目开车总结' where MenuId='ECDC614F-6239-44D2-9523-6A25D42C6A45'
-go
-update Sys_Menu set MenuName='开车完工报告',SortIndex=30 where MenuId='AA88BD56-E0B4-4B9C-9238-3F48EA59C50A'
-go
-insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-values('D215165B-95BA-4298-9736-B7A20F27B5D1','专项总结','TestRun/DriverSummary/SpecialSummary.aspx',10,'ECDC614F-6239-44D2-9523-6A25D42C6A45','Menu_TestRun',0,1,1)
-go
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('5ED79CA3-F5C5-4987-85CD-F0797FA4D5C8','D215165B-95BA-4298-9736-B7A20F27B5D1','增加',1)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('9C985452-F943-42B5-AC58-FE5DDDB91831','D215165B-95BA-4298-9736-B7A20F27B5D1','修改',2)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('8A359D94-434A-4275-935F-796C464711FC','D215165B-95BA-4298-9736-B7A20F27B5D1','删除',3)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('69A30098-93DE-45DE-B982-82362ABD0BEF','D215165B-95BA-4298-9736-B7A20F27B5D1','保存',4)
-	go
-insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-values('9EBA628D-E725-4A0B-B765-171F405D0821','完工后个人总结','TestRun/DriverSummary/PersonalSummary.aspx',20,'ECDC614F-6239-44D2-9523-6A25D42C6A45','Menu_TestRun',0,1,1)
-go
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('FF57ECA6-DB21-48A1-8F14-7AAD7F698C13','9EBA628D-E725-4A0B-B765-171F405D0821','增加',1)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('A0B04474-8F27-4DE2-9471-444163B04E8E','9EBA628D-E725-4A0B-B765-171F405D0821','修改',2)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('F3D17AC8-F40C-4E9B-9F11-34E4820E5095','9EBA628D-E725-4A0B-B765-171F405D0821','删除',3)
-	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
-	values('CCAFE438-A71E-41D9-A727-AC5A5C92D2A8','9EBA628D-E725-4A0B-B765-171F405D0821','保存',4)
-	go
-

SGGL/BLL/BLL.csproj

@@ -773,7 +773,6 @@
     <Compile Include="TestRun\DriverSummary\DriverSummaryService.cs" />
     <Compile Include="TestRun\FeedingTestRunService.cs" />
     <Compile Include="TestRun\Meeting\MeetingItemService.cs" />
-    <Compile Include="TestRun\Meeting\MeetingMinutesService.cs" />
     <Compile Include="TestRun\Meeting\MeetingService.cs" />
     <Compile Include="TestRun\PersonTrain\DriverPrepareTrainPlanService.cs" />
     <Compile Include="TestRun\PersonTrain\PersonTrainPlanService.cs" />

SGGL/BLL/Common/Const.cs

@@ -5523,20 +5523,10 @@ namespace BLL
         public const string MonthSummaryMenuId = "9B32C4BF-62E9-4561-8632-97AC0F581701";
 
         /// <summary>
-        /// 开车完工总结
+        /// 项目完工总结
         /// </summary>
         public const string CompleteSummaryMenuId = "AA88BD56-E0B4-4B9C-9238-3F48EA59C50A";
 
-        /// <summary>
-        /// 专项总结
-        /// </summary>
-        public const string SpecialSummaryMenuId = "D215165B-95BA-4298-9736-B7A20F27B5D1";
-
-        /// <summary>
-        /// 完工后个人总结
-        /// </summary>
-        public const string PersonalSummaryMenuId = "9EBA628D-E725-4A0B-B765-171F405D0821";
-
         #endregion
 
         #region 进度管理

SGGL/BLL/TestRun/DriverSummary/DriverSummaryService.cs

@@ -18,15 +18,6 @@ namespace BLL
             return Funs.DB.Driver_DriverSummary.FirstOrDefault(e => e.DriverSummaryId == driverSummaryId);
         }
 
-        /// <summary>
-        /// 获取总结列表
-        /// </summary>
-        /// <returns></returns>
-        public static List<Model.Driver_DriverSummary> GetSummaryList(string projectId, string summaryType)
-        {
-            return (from x in Funs.DB.Driver_DriverSummary where x.ProjectId == projectId && x.SummaryType == summaryType select x).ToList();
-        }
-
         /// <summary>
         /// 添加总结
         /// </summary>

SGGL/BLL/TestRun/Meeting/MeetingMinutesService.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BLL
-{
-    /// <summary>
-    /// 会议纪要
-    /// </summary>
-    public class MeetingMinutesService
-    {
-        /// <summary>
-        /// 根据主键获取会议纪要
-        /// </summary>
-        /// <param name="meetingMinutesId"></param>
-        /// <returns></returns>
-        public static Model.Driver_MeetingMinutes GetMinutesById(string meetingMinutesId)
-        {
-            return Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutesId);
-        }
-
-        /// <summary>
-        /// 添加会议纪要
-        /// </summary>
-        /// <param name="meetingMinutes"></param>
-        public static void AddMeetingMinutes(Model.Driver_MeetingMinutes meetingMinutes)
-        {
-            Model.Driver_MeetingMinutes newMeetingMinutes = new Model.Driver_MeetingMinutes
-            {
-                MeetingMinutesId = meetingMinutes.MeetingMinutesId,
-                ProjectId = meetingMinutes.ProjectId,
-                MinutesCode = meetingMinutes.MinutesCode,
-                MeetingType = meetingMinutes.MeetingType,
-                CompileMan = meetingMinutes.CompileMan,
-                CompileDate = meetingMinutes.CompileDate,
-                Statues = meetingMinutes.Statues
-            };
-            Funs.DB.Driver_MeetingMinutes.InsertOnSubmit(newMeetingMinutes);
-            Funs.DB.SubmitChanges();
-        }
-
-        /// <summary>
-        /// 修改会议纪要
-        /// </summary>
-        /// <param name="meetingMinutes"></param>
-        public static void UpdateMeetingMinutes(Model.Driver_MeetingMinutes meetingMinutes)
-        {
-            Model.Driver_MeetingMinutes newMeetingMinutes = Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutes.MeetingMinutesId);
-            if (newMeetingMinutes != null)
-            {
-                newMeetingMinutes.ProjectId = meetingMinutes.ProjectId;
-                newMeetingMinutes.MinutesCode = meetingMinutes.MinutesCode;
-                newMeetingMinutes.MeetingType = meetingMinutes.MeetingType;
-                newMeetingMinutes.CompileMan = meetingMinutes.CompileMan;
-                newMeetingMinutes.CompileDate = meetingMinutes.CompileDate;
-                newMeetingMinutes.Statues = meetingMinutes.Statues;
-                Funs.DB.SubmitChanges();
-            }
-        }
-
-        /// <summary>
-        /// 根据主键删除会议纪要
-        /// </summary>
-        /// <param name="meetingMinutesId"></param>
-        public static void DeleteMeetingMinutesById(string meetingMinutesId)
-        {
-            Model.Driver_MeetingMinutes newMeetingMinutes = Funs.DB.Driver_MeetingMinutes.FirstOrDefault(e => e.MeetingMinutesId == meetingMinutesId);
-            if (newMeetingMinutes != null)
-            {
-                Funs.DB.Driver_MeetingMinutes.DeleteOnSubmit(newMeetingMinutes);
-                Funs.DB.SubmitChanges();
-            }
-        }
-    }
-}

SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs

@@ -134,12 +134,6 @@ namespace FineUIPro.Web.AttachFile
                 //Request.QueryString["type"]; ////类型：0时是上传资源页面，附件权限不需要判断 -1时只查看权限 -2查看集团公司
                 this.GetButtonPower();
                 this.BindGrid();
-
-                //用于开车总结签字版附件，不可编辑
-                if (Request.QueryString["strParam"] == "2" && (this.MenuId == BLL.Const.SpecialSummaryMenuId || this.MenuId == BLL.Const.PersonalSummaryMenuId || this.MenuId == BLL.Const.CompleteSummaryMenuId))
-                {
-                    btnOnlineEdit.Hidden = true;
-                }
             }
             else
             {

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx

@@ -61,12 +61,6 @@
                         <f:RenderField ColumnID="Contents" DataField="Contents" FieldType="String" HeaderText="主要内容" TextAlign="Left"
                             HeaderTextAlign="Center" Width="280px">
                         </f:RenderField>
-                        <f:RenderField ColumnID="Problem" DataField="Problem" FieldType="String" HeaderText="问题类别" TextAlign="Left"
-                            HeaderTextAlign="Center" Width="280px">
-                        </f:RenderField>
-                        <f:RenderField ColumnID="Measure" DataField="Measure" FieldType="String" HeaderText="改进措施" TextAlign="Left"
-                            HeaderTextAlign="Center" Width="280px">
-                        </f:RenderField>
                         <f:RenderField ColumnID="IssuedDate" DataField="IssuedDate" FieldType="Date" Renderer="Date" HeaderText="下发日期" TextAlign="Center"
                             HeaderTextAlign="Center" Width="130px">
                         </f:RenderField>

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx.cs

@@ -28,7 +28,7 @@ namespace FineUIPro.Web.Comprehensive
         }
         public void BindGrid()
         {
-            string strSql = @"select NCRManagementId, ProjectId, SendUnit,  NCRCode, Contents,Problem,Measure,IssuedDate, ReceiveUnit,Status,
+            string strSql = @"select NCRManagementId, ProjectId, SendUnit,  NCRCode, Contents, IssuedDate, ReceiveUnit,Status,
                               ClosedDate, CompleteDate, ResponsibleMan, AttachUrl, ImplementationFrontState, 
                               CompileMan, UnitWorkId,CN.ProfessionalName,C.CNProfessionalId,u.UnitName  
                               from Comprehensive_NCRManagement C 

SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs

@@ -85,6 +85,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
                     }
                     this.txtMeasure.Text = nCRManagement.Measure;
 
+
                     this.txtResponsibleMan.Text = nCRManagement.ResponsibleMan;
                     this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState;
 

SGGL/FineUIPro.Web/ErrLog.txt

@@ -0,0 +1,330 @@
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:04/03/2024 17:51:45
+出错时间:04/03/2024 17:51: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:04/03/2024 17:51:46
+出错时间:04/03/2024 17:51: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:04/03/2024 17:51:46
+出错时间:04/03/2024 17:51: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:04/03/2024 17:51:46
+出错时间:04/03/2024 17:51: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.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:04/03/2024 19:51:41
+出错时间:04/03/2024 19:51:41
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:04/03/2024 19:51:41
+出错时间:04/03/2024 19:51:41
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:04/03/2024 19:51:42
+出错时间:04/03/2024 19:51:42
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:04/03/2024 19:51:42
+出错时间:04/03/2024 19:51:42
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
+出错时间:04/03/2024 21:51:41
+出错时间:04/03/2024 21:51:42
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
+出错时间:04/03/2024 21:51:42
+出错时间:04/03/2024 21:51:42
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
+出错时间:04/03/2024 21:51:42
+出错时间:04/03/2024 21:51:42
+
+
+错误信息开始=====>
+错误类型: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:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
+出错时间:04/03/2024 21:51:42
+出错时间:04/03/2024 21:51:42
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.CQMS.ManageReportNew.MonthReportEdit.Page_Load(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ManageReportNew\MonthReportEdit.aspx.cs:行号 193
+   在 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)
+出错时间:04/03/2024 23:11:43
+出错文件:http://localhost:8579/CQMS/ManageReportNew/MonthReportEdit.aspx?reportId=a5209a38-af66-4082-90ab-2585e44c3760
+IP地址:::1
+操作人员:JT
+
+出错时间:04/03/2024 23:11:43
+

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/DriverRunComplete/2024-04/638481924943334928_中建三局管道焊接管理信息系统简易手册.docx

@@ -1,102 +0,0 @@
-                                    目录
-1 焊接模块看板	1
-1.1 基础信息	2
-1.2 焊工管理	2
-1.3 焊接工艺评定	3
-1.4 焊接管理	4
-1.5 热处理/硬度管理	8
-1.6 无损委托	10
-1.7 返修委托	11
-1.8 检测管理	12
-1.9 试压管理	13
-1.10 焊接报表	14
-1.11 通用导入	15
-1.12 焊材管理	15
-
-
-1看板
-  包括基础信息、焊工管理、焊接工艺评定、焊接管理、热处理和硬度管理、无损委托、检测管理、返修委托、试压管理、焊接报表、通用导入、焊材管理等功能菜单。
-
-看板包括：一次合格率（总数）、焊工总人数（在岗）、焊接一次合格率（按工区和分包单位）、焊接进度分析（单位:万，按工区和分包单位）、近七日工效分析（当日总焊接量/当日焊工人数）。
-1.1 基础信息管理
-
-  施工单位可以在项目查看和维护本单位图纸上面对应的基础信息（建议只能增加，不要修改，里面存在的可能其他项目已经使用）。
-1.2 焊工管理
-
-
-注意：1、焊工增加的时候，焊工类型需要勾选是管道还是设备类型；
-     焊接方法、壁厚和母材类别默认没有勾选，如果本项目日报录入启用这三个条件筛选焊工，需设置，不勾选和条件全选一致。
-1.3 焊接工艺评定
-焊接工艺评定查询显示公司级增加的工艺评定，也可增加本项目的工艺评定。
-
-
-
-1.4 焊接管理
-1.4.1管线管理
-  管线可通过批量导入，也可单个录入
-
-1.4.2 焊口信息管理
-  焊口信息可通过批量导入，也可单个录入
-
-
-  焊口信息可直接在线按3503的2017版打印交工资料
-
-1.4.3 焊接日报
-  焊接日报可以录入和批量导入
-
-
-1.4.4 点口管理
-  点口查询的焊口是已经焊接的焊口，没有焊接过的焊口不能点口，点口中不会查询出来。
-
-
-1.5 热处理/硬度管理
-1.5.1 热处理委托
-热处理委托按工区查找需要热处理的焊口信息。
-
-1.5.2 热处理报告
-做完热处理委托会自动生成热处理报告，可以对此报告进行修改、打印。
-
-1.5.3 硬度检测委托
-操作方法同热处理委托单
-1.5.4 硬度检测报告
-操作方法同热处理报告
-1.6 无损委托
-1.6.1 无损委托单录入
-通过点口单可直接生成委托单（点口单右上角有生成按钮），或者直接增加、查找。
-
-
-
-1.6.2 无损委托单审核
-
-审核后的委托单才能在检测单录入中找到。
-1.7返修委托
-1.7.1 返修委托单录入
-操作方法同委托单录入。
-1.7.2 返修单审核
-操作方法同委托单审核。
-1.8 检测管理
-1.8.1 检测单录入
-
-操作方法同委托单录入。
-1.8.2 检测单审核
-操作方法同委托单审核。
-1.8.3 检测导入
-检测导入按系统模板整理批量导入，并能自动校验数据的正确性。
-
-检测导入是一次导入点口、委托、检测，并且是已审核状态。
-1.8.4 检测统计
-检测统计按检测方法导入，并可修改，打印。
-
-1.9 试压管理
-
-试压包台账可以通过导入方法增加，审核完成后可打印出交工资料。
-1.10 焊接报表
-
-  焊接报表包括：单位工区进度分析、单位工区质量分析、焊工业绩分析、管线综合分析、预制安装进度、介质综合分析、探伤综合报告、焊口综合信息、管线综合信息、委托检测数据一览表、无损检测周报、无损检测月报、储罐/管道每日焊接量统计表、管道焊接周报、管道焊接月报。上图以单位工区进度分析为例，按不同的查询条件可查询统计需要查询的数据，其他报表查询方法一致。
-
-周报月报可以在线打印：
-1.11 通用导入
-  管线焊口按系统模板整理批量导入，并能自动校验数据的正确性
-1.12 焊材管理
-  焊材管理包括：厂家管理、材料到货登记及验收记录、焊条烘烤记录、焊条发放记录、焊条回收记录、二次焊条烘烤记录和今日统计。
-上述功能菜单都可以单条记录增加，也可以批量按模板导入。自动生成今日统计表数据。

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/LinkedTestRunReport/2024-04/638481924048752201_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverReport/MonthReport/2024-04/638481898114730786_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/CompleteSummary/2024-04/638483556968980495_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/PersonalSummary/2024-04/638483556427718917_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/DriverSummary/SpecialSummary/2024-04/638483439152206907_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482762471567333_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482764980943824_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767086042191_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638482767851405460_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FileUpload/TestRun/Meeting/MeetingMinutes/2024-04/638483429006507650_新建文档.docx

@@ -1,3 +0,0 @@
-1、复制按钮复制的是选中的节点及详细信息，例如选中土方工程右击复制，则复制的是土方工程及土方工程的详细信息，若不是在末级菜单复制，则复制的是选中节点及以下子节点并且包含详细信息，例如选中节点地基基础点击复制则复制的是地基基础及地基基础下的土方工程、地基处理等子节点并且包含每个复制节点的详细信息。
-2、粘贴按钮是将复制的内容粘贴在选中节点的下方，例如复制了地基基础，选中土建右击粘贴，则把复制地基基础及子节点粘贴在土建下方节点。
-

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -1802,10 +1802,6 @@
     <Content Include="TestRun\DriverSummary\CompleteSummaryEdit.aspx" />
     <Content Include="TestRun\DriverSummary\MonthSummary.aspx" />
     <Content Include="TestRun\DriverSummary\MonthSummaryEdit.aspx" />
-    <Content Include="TestRun\DriverSummary\PersonalSummary.aspx" />
-    <Content Include="TestRun\DriverSummary\PersonalSummaryEdit.aspx" />
-    <Content Include="TestRun\DriverSummary\SpecialSummary.aspx" />
-    <Content Include="TestRun\DriverSummary\SpecialSummaryEdit.aspx" />
     <Content Include="TestRun\FeedingTestRun.aspx" />
     <Content Include="TestRun\FeedingTestRunEdit.aspx" />
     <Content Include="TestRun\Feeding\FeedingRunApplication.aspx" />
@@ -1829,8 +1825,6 @@
     <Content Include="TestRun\Meeting\MeetingInitiate.aspx" />
     <Content Include="TestRun\Meeting\MeetingInitiateEdit.aspx" />
     <Content Include="TestRun\Meeting\MeetingSummary.aspx" />
-    <Content Include="TestRun\Meeting\MeetingSummaryEdit.aspx" />
-    <Content Include="TestRun\Meeting\MeetingSummaryView.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeeting.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeetingEdit.aspx" />
     <Content Include="TestRun\Meeting\ScheduleMeetingView.aspx" />
@@ -16233,34 +16227,6 @@
     <Compile Include="TestRun\DriverSummary\MonthSummaryEdit.aspx.designer.cs">
       <DependentUpon>MonthSummaryEdit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="TestRun\DriverSummary\PersonalSummary.aspx.cs">
-      <DependentUpon>PersonalSummary.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\PersonalSummary.aspx.designer.cs">
-      <DependentUpon>PersonalSummary.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\PersonalSummaryEdit.aspx.cs">
-      <DependentUpon>PersonalSummaryEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\PersonalSummaryEdit.aspx.designer.cs">
-      <DependentUpon>PersonalSummaryEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\SpecialSummary.aspx.cs">
-      <DependentUpon>SpecialSummary.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\SpecialSummary.aspx.designer.cs">
-      <DependentUpon>SpecialSummary.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\SpecialSummaryEdit.aspx.cs">
-      <DependentUpon>SpecialSummaryEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\DriverSummary\SpecialSummaryEdit.aspx.designer.cs">
-      <DependentUpon>SpecialSummaryEdit.aspx</DependentUpon>
-    </Compile>
     <Compile Include="TestRun\FeedingTestRun.aspx.cs">
       <DependentUpon>FeedingTestRun.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16422,20 +16388,6 @@
     <Compile Include="TestRun\Meeting\MeetingSummary.aspx.designer.cs">
       <DependentUpon>MeetingSummary.aspx</DependentUpon>
     </Compile>
-    <Compile Include="TestRun\Meeting\MeetingSummaryEdit.aspx.cs">
-      <DependentUpon>MeetingSummaryEdit.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\Meeting\MeetingSummaryEdit.aspx.designer.cs">
-      <DependentUpon>MeetingSummaryEdit.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="TestRun\Meeting\MeetingSummaryView.aspx.cs">
-      <DependentUpon>MeetingSummaryView.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="TestRun\Meeting\MeetingSummaryView.aspx.designer.cs">
-      <DependentUpon>MeetingSummaryView.aspx</DependentUpon>
-    </Compile>
     <Compile Include="TestRun\Meeting\ScheduleMeeting.aspx.cs">
       <DependentUpon>ScheduleMeeting.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />

SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx

@@ -9,9 +9,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            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"
@@ -60,7 +60,7 @@
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunComplete.aspx.cs

@@ -37,12 +37,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
                                      report.ReportType, 
                                      report.Remark,
                                      unitWork.UnitWorkName,
-                                     u.UserName AS CompilePersonName,
+                                     u.UserName AS CompilePersonName"
-                                     RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl"
                             + @" 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"
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='6'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx

@@ -83,8 +83,6 @@
                                                     </f:Label>
                                                     <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                                     </f:Button>
-                                                    <f:Label ID="lbtnAttach" runat="server">
-                                                    </f:Label>
                                                 </Items>
                                             </f:Panel>
                                         </Items>
@@ -98,7 +96,7 @@
         </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" OnClose="WindowAtt_Close">
+            Height="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System.Collections.Generic;
 
 namespace FineUIPro.Web.TestRun.DriverReport
 {
@@ -35,7 +34,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
                         //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
-                        WindowAtt_Close(null, null);
                     }
                 }
                 else
@@ -61,28 +59,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/DriverRunComplete&menuId={1}", this.hdId.Text, BLL.Const.DriverRunCompleteMenuId)));
         }
-
-        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
-        {
-            this.lbtnAttach.Text = string.Empty;
-            string url = string.Empty;
-            var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.DriverRunCompleteMenuId);
-            if (attLists != null)
-            {
-                List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
-                if (lists.Count > 0)
-                {
-                    foreach (var item in lists)
-                    {
-                        url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
-                    }
-                }
-                if (!string.IsNullOrEmpty(url))
-                {
-                    this.lbtnAttach.Text = url;
-                }
-            }
-        }
         #endregion
 
         #region 保存

SGGL/FineUIPro.Web/TestRun/DriverReport/DriverRunCompleteEdit.aspx.designer.cs

@@ -174,15 +174,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
-        /// <summary>
-        /// lbtnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbtnAttach;
-        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx

@@ -9,9 +9,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            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"
@@ -60,7 +60,7 @@
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReport.aspx.cs

@@ -37,12 +37,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
                                      report.ReportType, 
                                      report.Remark,
                                      unitWork.UnitWorkName,
-                                     u.UserName AS CompilePersonName,
+                                     u.UserName AS CompilePersonName"
-                                     RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl"
                             + @" 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"
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='4'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx

@@ -83,8 +83,6 @@
                                                     </f:Label>
                                                     <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                                     </f:Button>
-                                                    <f:Label ID="lbtnAttach" runat="server">
-                                                    </f:Label>
                                                 </Items>
                                             </f:Panel>
                                         </Items>
@@ -98,7 +96,7 @@
         </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" OnClose="WindowAtt_Close">
+            Height="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System.Collections.Generic;
 
 namespace FineUIPro.Web.TestRun.DriverReport
 {
@@ -35,7 +34,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
                         //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
-                        WindowAtt_Close(null, null);
                     }
                 }
                 else
@@ -61,28 +59,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/FeedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.FeedTestRunReportMenuId)));
         }
-
-        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
-        {
-            this.lbtnAttach.Text = string.Empty;
-            string url = string.Empty;
-            var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.FeedTestRunReportMenuId);
-            if (attLists != null)
-            {
-                List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
-                if (lists.Count > 0)
-                {
-                    foreach (var item in lists)
-                    {
-                        url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
-                    }
-                }
-                if (!string.IsNullOrEmpty(url))
-                {
-                    this.lbtnAttach.Text = url;
-                }
-            }
-        }
         #endregion
 
         #region 保存

SGGL/FineUIPro.Web/TestRun/DriverReport/FeedTestRunReportEdit.aspx.designer.cs

@@ -174,15 +174,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
-        /// <summary>
-        /// lbtnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbtnAttach;
-        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx

@@ -9,9 +9,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            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"
@@ -60,7 +60,7 @@
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReport.aspx.cs

@@ -37,12 +37,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
                                      report.ReportType, 
                                      report.Remark,
                                      unitWork.UnitWorkName,
-                                     u.UserName AS CompilePersonName,
+                                     u.UserName AS CompilePersonName"
-                                     RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl"
                             + @" 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"
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='3'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx

@@ -83,8 +83,6 @@
                                                     </f:Label>
                                                     <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                                     </f:Button>
-                                                    <f:Label ID="lbtnAttach" runat="server">
-                                                    </f:Label>
                                                 </Items>
                                             </f:Panel>
                                         </Items>
@@ -98,7 +96,7 @@
         </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" OnClose="WindowAtt_Close">
+            Height="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System.Collections.Generic;
 
 namespace FineUIPro.Web.TestRun.DriverReport
 {
@@ -35,7 +34,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
                         //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
-                        WindowAtt_Close(null, null);
                     }
                 }
                 else
@@ -61,28 +59,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/LinkedTestRunReport&menuId={1}", this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId)));
         }
-
-        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
-        {
-            this.lbtnAttach.Text = string.Empty;
-            string url = string.Empty;
-            var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.LinkedTestRunReportMenuId);
-            if (attLists != null)
-            {
-                List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
-                if (lists.Count > 0)
-                {
-                    foreach (var item in lists)
-                    {
-                        url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
-                    }
-                }
-                if (!string.IsNullOrEmpty(url))
-                {
-                    this.lbtnAttach.Text = url;
-                }
-            }
-        }
         #endregion
 
         #region 保存

SGGL/FineUIPro.Web/TestRun/DriverReport/LinkedTestRunReportEdit.aspx.designer.cs

@@ -174,15 +174,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
-        /// <summary>
-        /// lbtnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbtnAttach;
-        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx

@@ -9,9 +9,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车月报告" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="MonthReportId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="MonthReportId" AllowSorting="true" SortField="MonthReportDate"
@@ -47,8 +47,8 @@
                             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="180px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReport.aspx.cs

@@ -28,10 +28,8 @@ namespace FineUIPro.Web.TestRun.DriverReport
             string strSql = @"SELECT report.MonthReportId, 
                                      report.ProjectId, 
                                      report.MonthReportCode, 
-                                     (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate,
+                                     (CONVERT(varchar(10),DATEADD(DAY,1,DATEADD(MONTH,-1,report.MonthReportDate)),120)+'至'+CONVERT(varchar(10),report.MonthReportDate,120)) as MonthReportDate"
-                                    RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl"
                             + @" FROM TestRun_MonthReport AS report "
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.MonthReportId "
                             + @" WHERE report.ProjectId=@projectId ";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx

@@ -618,8 +618,6 @@
                                                     </f:Label>
                                                     <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                                     </f:Button>
-                                                    <f:Label ID="lbtnAttach" runat="server">
-                                                    </f:Label>
                                                 </Items>
                                             </f:Panel>
                                         </Items>
@@ -632,7 +630,7 @@
             </Rows>
         </f:Form>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
-            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" OnClose="WindowAtt_Close"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
             Height="500px">
         </f:Window>
     </form>

SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.cs

@@ -80,7 +80,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                         this.Grid3.DataSource = items3;
                         this.Grid3.DataBind();
                     }
-                    WindowAtt_Close(null, null);
                 }
                 else
                 {
@@ -148,27 +147,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
             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)));
         }
-        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
-        {
-            this.lbtnAttach.Text = string.Empty;
-            string url = string.Empty;
-            var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.MonthReportMenuId);
-            if (attLists != null)
-            {
-                List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
-                if (lists.Count > 0)
-                {
-                    foreach (var item in lists)
-                    {
-                        url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
-                    }
-                }
-                if (!string.IsNullOrEmpty(url))
-                {
-                    this.lbtnAttach.Text = url;
-                }
-            }
-        }
         #endregion
 
         #region 保存

SGGL/FineUIPro.Web/TestRun/DriverReport/MonthReportEdit.aspx.designer.cs

@@ -1011,15 +1011,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
-        /// <summary>
-        /// lbtnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbtnAttach;
-        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx

@@ -9,9 +9,9 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            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"
@@ -60,7 +60,7 @@
                             FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
                         </f:RenderField>
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
-                            TextAlign="Center" ToolTip="附件查看" DataTextField="AttachUrl" ExpandUnusedSpace="true" />
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReport.aspx.cs

@@ -37,12 +37,10 @@ namespace FineUIPro.Web.TestRun.DriverReport
                                      report.ReportType, 
                                      report.Remark,
                                      unitWork.UnitWorkName,
-                                     u.UserName AS CompilePersonName,
+                                     u.UserName AS CompilePersonName"
-                                     RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl"
                             + @" 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"
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=report.DriverReportId "
                             + @" WHERE report.ProjectId=@projectId AND report.ReportType='5'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));

SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx

@@ -83,8 +83,6 @@
                                                     </f:Label>
                                                     <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                                                     </f:Button>
-                                                    <f:Label ID="lbtnAttach" runat="server">
-                                                    </f:Label>
                                                 </Items>
                                             </f:Panel>
                                         </Items>
@@ -98,7 +96,7 @@
         </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" OnClose="WindowAtt_Close">
+            Height="500px">
         </f:Window>
     </form>
 </body>

SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.cs

@@ -1,6 +1,5 @@
 using BLL;
 using System;
-using System.Collections.Generic;
 
 namespace FineUIPro.Web.TestRun.DriverReport
 {
@@ -35,7 +34,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
                         this.txtSubmitDate.Text = data.SubmitDate.HasValue ? string.Format("{0:yyyy-MM-dd}", data.SubmitDate) : "";
                         //this.txtNumber.Text = data.Number;
                         this.txtRemark.Text = data.Remark;
-                        WindowAtt_Close(null, null);
                     }
                 }
                 else
@@ -61,28 +59,6 @@ namespace FineUIPro.Web.TestRun.DriverReport
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverReport/PropertyReport&menuId={1}", this.hdId.Text, BLL.Const.PropertyReportMenuId)));
         }
-
-        protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
-        {
-            this.lbtnAttach.Text = string.Empty;
-            string url = string.Empty;
-            var attLists = BLL.AttachFileService.Getfiles(this.hdId.Text, BLL.Const.PropertyReportMenuId);
-            if (attLists != null)
-            {
-                List<string> lists = Funs.GetStrListByStr(attLists.AttachUrl, ',');
-                if (lists.Count > 0)
-                {
-                    foreach (var item in lists)
-                    {
-                        url += item.Substring(item.IndexOf('_') + 1) + "\r\n";
-                    }
-                }
-                if (!string.IsNullOrEmpty(url))
-                {
-                    this.lbtnAttach.Text = url;
-                }
-            }
-        }
         #endregion
 
         #region 保存

SGGL/FineUIPro.Web/TestRun/DriverReport/PropertyReportEdit.aspx.designer.cs

@@ -174,15 +174,6 @@ namespace FineUIPro.Web.TestRun.DriverReport {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
-        /// <summary>
-        /// lbtnAttach 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Label lbtnAttach;
-        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx

@@ -5,27 +5,28 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>开车完工总结</title>
+    <title>项目完工总结</title>
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:PageManager ID="PageManager1" runat="server" />
-        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+        <f:Panel ID="Panel1" runat="server" Margin="1px" BodyPadding="1px" ShowBorder="false"
-            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            ShowHeader="false" Layout="HBox" BoxConfigAlign="Stretch">
             <Items>
-                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="开车完工总结" EnableCollapse="true"
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="项目完工总结" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DriverSummaryId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSummaryId" AllowSorting="true" SortField="SubmitDate"
+                    runat="server" BoxFlex="1" DataKeyNames="DriverSummaryId" AllowCellEditing="true" ClicksToEdit="2" DataIDField="DriverSummaryId" AllowSorting="true" SortField="DriverSummaryCode"
-                    SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    SortDirection="ASC" 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:TextBox ID="txtDriverSummaryCode" runat="server" Label="总结名称" LabelAlign="Right"></f:TextBox>
+                                <%--<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">
                                 </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
-                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" runat="server" Hidden="true" OnClick="btnNew_Click">
+                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
@@ -37,16 +38,26 @@
                                 <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="DriverSummaryCode" DataField="DriverSummaryCode"
-                            FieldType="String" HeaderText="总结名称" HeaderTextAlign="Center" Width="400px">
+                            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="SummaryPersonName" DataField="SummaryPersonName"
-                            FieldType="String" HeaderText="总结人" HeaderTextAlign="Center" Width="200px">
+                            FieldType="String" HeaderText="总结人" HeaderTextAlign="Center" Width="120px">
                         </f:RenderField>
-                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="180px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                        <f:RenderField ColumnID="SubmitDate" DataField="SubmitDate"
-                            TextAlign="Center" ToolTip="附件查看"  ExpandUnusedSpace="true" DataTextField="AttachUrl"/>
+                            FieldType="Date" Renderer="Date" HeaderText="总结日期" HeaderTextAlign="Center" Width="110px">
-                        <f:LinkButtonField HeaderText="签字版附件" ConfirmTarget="Top" Width="180px" CommandName="AttachUrl2" ColumnID="AttachUrl2"
+                        </f:RenderField>
-                            TextAlign="Center" ToolTip="附件查看"  ExpandUnusedSpace="true" DataTextField="AttachUrl2"/>
+                        <f:RenderField ColumnID="Remark" DataField="Remark"
+                            FieldType="String" HeaderText="备注" HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
+                        </f:RenderField>
+                        <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" Width="80px" CommandName="AttachUrl" ColumnID="AttachUrl"
+                            TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                     </Columns>
                     <Listeners>
                         <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@@ -67,9 +78,9 @@
                 </f:Grid>
             </Items>
         </f:Panel>
-        <f:Window ID="Window1" Title="开车完工总结" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        <f:Window ID="Window1" Title="项目完工总结" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-            Width="700px" Height="300px">
+            Width="900px" Height="550px">
         </f:Window>
         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"

SGGL/FineUIPro.Web/TestRun/DriverSummary/CompleteSummary.aspx.cs

@@ -16,6 +16,8 @@ namespace FineUIPro.Web.TestRun.DriverSummary
             {
                 GetButtonPower();
                 BindGrid();
+                btnNew.OnClientClick = Window1.GetShowReference("CompleteSummaryEdit.aspx") + "return false;";
+                //BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
             }
         }
         #endregion
@@ -32,20 +34,24 @@ namespace FineUIPro.Web.TestRun.DriverSummary
                                      summary.SummaryPerson, 
                                      summary.SummaryType, 
                                      summary.SubmitDate, 
-                                     u.UserName AS SummaryPersonName,
+                                     summary.Remark,
-									RIGHT(att.AttachUrl,CHARINDEX('_',REVERSE(att.AttachUrl))-1) AS  AttachUrl,
+                                     unitWork.UnitWorkName,
-                                    RIGHT(att2.AttachUrl, CHARINDEX('_', REVERSE(att2.AttachUrl)) - 1) AS AttachUrl2"
+                                     u.UserName AS SummaryPersonName"
-                                + @" FROM Driver_DriverSummary AS summary "
+                            + @" FROM Driver_DriverSummary AS summary "
+                            + @" LEFT JOIN WBS_UnitWork AS unitWork ON unitWork.UnitWorkId = summary.UnitWorkId"
                             + @" LEFT JOIN Sys_User AS u ON u.UserId = summary.SummaryPerson"
-                            + @" LEFT JOIN AttachFile AS att ON att.ToKeyId=summary.DriverSummaryId+'#1'"
+                            + @" WHERE summary.ProjectId=@projectId AND summary.SummaryType='2'";
-                            + @" LEFT JOIN AttachFile AS att2 ON att2.ToKeyId=summary.DriverSummaryId+'#2'"
-                             + @" WHERE summary.ProjectId=@projectId AND summary.SummaryType='3'";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            if (!string.IsNullOrEmpty(this.txtDriverSummaryCode.Text.Trim()))
+            //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.DriverSummaryCode LIKE @DriverSummaryCode";
+                strSql += " AND summary.Summary LIKE @Summary";
-                listStr.Add(new SqlParameter("@DriverSummaryCode", "%" + this.txtDriverSummaryCode.Text.Trim() + "%"));
+                listStr.Add(new SqlParameter("@Summary", "%" + this.txtSummary.Text.Trim() + "%"));
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -113,27 +119,6 @@ namespace FineUIPro.Web.TestRun.DriverSummary
         #endregion
 
         #region 编辑
-        /// <summary>
-        /// 增加
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnNew_Click(object sender, EventArgs e)
-        {
-            var q = BLL.DriverSummaryService.GetSummaryList(this.CurrUser.LastProjectId, "3");
-            if (q.Count() > 0)
-            {
-                Alert.ShowInTop("开车完成报告已存在！", MessageBoxIcon.Warning);
-                return;
-            }
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CompleteSummaryEdit.aspx", "编辑 - ")));
-        }
-
-        /// <summary>
-        /// 右键编辑
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
         protected void btnMenuModify_Click(object sender, EventArgs e)
         {
             EditData();
@@ -194,11 +179,7 @@ namespace FineUIPro.Web.TestRun.DriverSummary
             string id = Grid1.DataKeys[e.RowIndex][0].ToString();
             if (e.CommandName == "AttachUrl")
             {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSummary/CompleteSummary&menuId={1}&strParam=1", id, BLL.Const.CompleteSummaryMenuId)));
+                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSummary/CompleteSummary&menuId={1}", id, BLL.Const.CompleteSummaryMenuId)));
-            }
-            if (e.CommandName == "AttachUrl2")
-            {
-                PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=-1&toKeyId={0}&path=FileUpload/TestRun/DriverSummary/CompleteSummary&menuId={1}&strParam=2", id, BLL.Const.CompleteSummaryMenuId)));
             }
         }
         #endregion