From 2343cca1fa79a268d3d892be05c590a5ab65497f Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Sun, 8 Oct 2023 15:32:21 +0800 Subject: [PATCH] 2023-10-8 --- .vs/SGGL_CWCEC/v17/.wsuo | Bin 31232 -> 32256 bytes .../版本日志/SGGLDB_WH_2023-09-27.sql | Bin 0 -> 31954 bytes .../CQMS/ManageReport/MonthReportEdit.aspx | 41 +++--- .../CQMS/ManageReport/MonthReportEdit.aspx.cs | 38 +++-- .../CQMS/ManageReport/WeekReportEdit.aspx.cs | 136 ++++++++++++------ .../DocManage/DocManageEdit.aspx | 20 ++- .../DocManage/DocManageEdit.aspx.cs | 2 +- 7 files changed, 149 insertions(+), 88 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-27.sql diff --git a/.vs/SGGL_CWCEC/v17/.wsuo b/.vs/SGGL_CWCEC/v17/.wsuo index fb786c57c5230d77134b28012e54db01ed3e14c9..af66e84d40ae4d2abfa35d0b9a82f3009dee51b3 100644 GIT binary patch delta 1738 zcmc&!-%nFl9PjsVflIxG0@oH&EG=Qfu~wmUw0DRWf3gkMW<};=RKR;{f{F5@O@J)n zF58Py6YV!KKA5=hv@F?!+$HnLu(`xV_qK;+$^Haimb4FZ3j2QHcB>{Jn-8AkbINF!{Jz?hSx>A zYnleT3EZ3rlCOIQMU{kVLJgsb@Fsy%+;(4O_q({qptJD}pUtqUh2mO5u#96~!Jyo@ ztAkkHv2={LDGm|Bgm*~cy*?%fdub3O#0mQdoL*}EG*&l+g}fNDouhrt56B?iRXL9Zq3RU4%ZXNMFToTVs1@dQPZZXdW=$wPSqj z`4mp#9j{NGC{b6u*}Q*H<_AJbdk4P><5=`36@DvBbKBUwHKlODOOJ-hs#zk=Ncf~~ z0md-rUaUMz#3=shPRe`@|0dTb@sPW_hR;O2!-3Dd4-}b#20}>&r?J@dp$mB2Sk7x! zuK5wbK^*WMP=IC_M~07%;1yp~=^0I@)`>&u6#nds{vTI$W!u@VtS9wVBJat*LWP6h zxg093>?vCv&RDsw+kk3lj4v{@evzRau-qOH7?=!TqQ#A=$vMz*dOC^PTnA1~&*RSX zgZY-gO9cCW{0}w7T=V6nJz}|22uno22fV*`7~K&avuX=oi|7!?V&roe!ug&{DB1=# zv9bm)CRp>azW`dTT;FA}9M4jSIqj+?68o#Sdxf}iYz0>a6KE3R!wdNP`%deN_qrq{ z)Rw+DlTFQBoHAxMRbe4Lgk3_y#EAMFR!@X1b0h)zk;LZnqX(<;@bQRM_*kjR>q|JH z`zyc!SYh;6@=wKqM~pr+CnY>=9L0x5F97|Wo3J_4kD_QPFR_#>31?Tfe@gDS@}oYnC?m0LtUP0hX3@?f?J) delta 1891 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 - +
1、本月主要工作内容 @@ -161,7 +161,7 @@
- +
2、本月质量问题处理情况 @@ -173,7 +173,7 @@
- +
 1）原材料问题 @@ -257,7 +257,7 @@
- +
 2）施工过程问题 @@ -343,7 +343,7 @@
- + - + - + @@ -416,7 +416,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -476,7 +476,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -506,7 +506,7 @@ - + - + - + - + - +
3、本月质量控制 @@ -355,7 +355,7 @@
- +
 1）综合管理 @@ -395,13 +395,13 @@
 2）检验批统计
 土建：
 设备：
 管道：
 电气：
 仪表：
 防腐：
 消防：
 3）无损检测统计 @@ -523,7 +523,7 @@
 4）NCR统计 @@ -531,6 +531,7 @@
+ @@ -540,7 +541,7 @@
 5）设计变更统计 @@ -557,7 +558,7 @@
 6）合格焊工统计 @@ -574,7 +575,7 @@
 7）施工方案统计 @@ -594,7 +595,7 @@
- +
4、下月质量控制重点 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs index 3d4bdc5c..13dd9b26 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/MonthReportEdit.aspx.cs @@ -96,8 +96,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } else { - this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)); + + 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"]; //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00"); } @@ -1272,19 +1273,26 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) { - CheckLotBindStatisc("CV");//检验批统计:土建 - CheckLotBindStatisc("EQ");//检验批统计:设备 - CheckLotBindStatisc("PP");//检验批统计:管道 - CheckLotBindStatisc("EL");//检验批统计:电气 - CheckLotBindStatisc("IN");//检验批统计:仪表 - CheckLotBindStatisc("FF");//检验批统计:反腐 - CheckLotBindStatisc("XF");//检验批统计:消防 - GetComprehensive();//综合管理 - BindStatisc();//无损检测统计 - NCRBindStatisc();//NCR统计 - DesignChangeOrderBindStatisc();//设计变更统计 - PassWelderBindStatisc();//合格焊工统计 - ConstructionStatisticsr();//施工方案统计 + //CheckLotBindStatisc("CV");//检验批统计:土建 + //CheckLotBindStatisc("EQ");//检验批统计:设备 + //CheckLotBindStatisc("PP");//检验批统计:管道 + //CheckLotBindStatisc("EL");//检验批统计:电气 + //CheckLotBindStatisc("IN");//检验批统计:仪表 + //CheckLotBindStatisc("FF");//检验批统计:反腐 + //CheckLotBindStatisc("XF");//检验批统计:消防 + //GetComprehensive();//综合管理 + //BindStatisc();//无损检测统计 + //NCRBindStatisc();//NCR统计 + //DesignChangeOrderBindStatisc();//设计变更统计 + //PassWelderBindStatisc();//合格焊工统计 + //ConstructionStatisticsr();//施工方案统计 + //Response.AddHeader("Refresh", "0"); + 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 diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs index 2c70c57e..2420da5e 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs @@ -59,6 +59,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { 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"])) @@ -87,15 +88,18 @@ namespace FineUIPro.Web.CQMS.ManageReport //this.txtPeriod.ReadOnly = true; //this.txtStartDate.Enabled = false; //this.txtEndDate.Enabled = false; - GetThisWeekOrMonthContentList(this.ReportId);//本周主要工作内容 + GetThisWeekOrMonthContentList(this.ReportId);//本月主要工作内容 GetRowMaterialProblemList(this.ReportId);//原材料问题 GetConstructionProblemsList(this.ReportId);//施工过程问题 - GetNextQualityControlList(this.ReportId);//下周质量控制重点 + GetNextQualityControlList(this.ReportId);//下月质量控制重点 } else { - this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)); - this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); + + this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"]; + this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now ): Request.Params["enddate"]; + //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00"); + //this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", "2023-10-18 01:01:00"); } CheckLotBindStatisc("CV");//检验批统计:土建 CheckLotBindStatisc("EQ");//检验批统计:设备 @@ -110,7 +114,6 @@ namespace FineUIPro.Web.CQMS.ManageReport DesignChangeOrderBindStatisc();//设计变更统计 PassWelderBindStatisc();//合格焊工统计 ConstructionStatisticsr();//施工方案统计 - } } @@ -119,23 +122,29 @@ namespace FineUIPro.Web.CQMS.ManageReport /// private void GetComprehensive() { - int count = 0; + decimal? count = 0; var inspectionEquipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" select x).ToList(); foreach (var item in inspectionEquipments) { count += Funs.GetNewIntOrZero(item.Counts); } - //this.txt1.Text = Convert.ToString(count); this.txt3.Text = Convert.ToString(count); - int thisWeekCount = 0; + decimal? thisWeekCount = 0; var equpments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.CNProfessionalId == BLL.Const.EQCNProfessionalId && x.EquipmentOrMatail == "设备" && x.InspectionDate >= Convert.ToDateTime(this.txtStartDate.Text) && x.InspectionDate <= Convert.ToDateTime(this.txtEndDate.Text) select x).ToList(); foreach (var item in equpments) { thisWeekCount += Funs.GetNewIntOrZero(item.Counts); } this.txt2.Text = Convert.ToString(thisWeekCount); - + //if (Convert.ToDecimal(this.txt3.Text.Trim()) > 0) + //{ + // this.txt4.Text = Math.Round((double)(Convert.ToDecimal(this.txt2.Text.Trim()) / Convert.ToDecimal(this.txt3.Text.Trim())) * 100, 2) + "%"; + //} + //else + //{ + // this.txt4.Text = "0"; + //} var Uequipments = (from x in Funs.DB.Comprehensive_InspectionEquipment where x.ProjectId == this.CurrUser.LoginProjectId && x.EquipmentOrMatail == "材料" @@ -209,7 +218,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 本周主要工作内容 + /// 本月主要工作内容 /// private void GetThisWeekOrMonthContentList(string reportId) { @@ -244,7 +253,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 下周质量控制重点 + /// 下月质量控制重点 /// /// private void GetNextQualityControlList(string reportId) @@ -256,9 +265,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } #endregion - #region 本周主要内容 + #region 本月主要内容 /// - /// 增加本周主要内容 + /// 增加本月主要内容 /// /// /// @@ -275,7 +284,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 检查并保存本周主要内容集合 + /// 检查并保存本月主要内容集合 /// private void saveThisWeekAndMonthContent() { @@ -292,7 +301,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } /// - /// 本周主要内容行点击事件 + /// 本月主要内容行点击事件 /// /// /// @@ -385,6 +394,7 @@ namespace FineUIPro.Web.CQMS.ManageReport this.gvRowMaterialProblem.DataBind(); } } + #endregion #region 施工过程问题 @@ -480,10 +490,11 @@ namespace FineUIPro.Web.CQMS.ManageReport #endregion #region 检验批统计 + #region 绑定GridView /// - /// 绑定数据 + /// 绑定 /// - /// + /// public void CheckLotBindStatisc(string cNProfessionalCode) { DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim()); @@ -514,7 +525,7 @@ namespace FineUIPro.Web.CQMS.ManageReport Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(breakdownProject.DivisionProjectId); if (divisionProject != null) { - Model.WBS_UnitWork ins = BLL.UnitWorkService.getUnitWorkByUnitWorkId(divisionProject.UnitWorkId); + Model.WBS_UnitWork ins = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(divisionProject.UnitWorkId); if (ins != null) { if (!workNames.Contains(ins.UnitWorkName)) //新增记录 @@ -542,9 +553,9 @@ namespace FineUIPro.Web.CQMS.ManageReport } } } - /*if (cNProfessionalId == BLL.Const.CNProfessionalCVId) //土建按单位工程统计 { + } else { @@ -631,6 +642,34 @@ namespace FineUIPro.Web.CQMS.ManageReport } StatisticsList.Add(StatisticsLast); } + else //新增本周/月无验收数据的也需要列出表格 + { + + Model.CheckStatisc StatisticsLast = new Model.CheckStatisc(); + StatisticsLast.Num = StatisticsList.Count() + 1; + StatisticsLast.WorkName = "合计"; + StatisticsLast.CheckNum = 0; + StatisticsLast.TotalCheckNum = 0; + StatisticsLast.OKNum = 0; + StatisticsLast.TotalOKNum = 0; + if (StatisticsLast.CheckNum != 0)//被除数不能为零 + { + StatisticsLast.OneOKRate = Math.Round((double)StatisticsLast.OKNum / (double)StatisticsLast.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsLast.OneOKRate = "0%"; + } + if (StatisticsLast.TotalCheckNum != 0)//被除数不能为零 + { + StatisticsLast.TotalOneOKRate = Math.Round((double)StatisticsLast.TotalOKNum / (double)StatisticsLast.TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入 + } + else + { + StatisticsLast.TotalOneOKRate = "0%"; + } + StatisticsList.Add(StatisticsLast); + } if (cNProfessionalCode == "CV") { @@ -668,6 +707,7 @@ namespace FineUIPro.Web.CQMS.ManageReport this.gvXF.DataBind(); } } + #endregion /// /// GridView创建行时激发 @@ -808,7 +848,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#分包商#探伤部位#RT数量 本周,累计#一次合格 本周,累计#一次合格率 本周,累计"; + string headerStr = "序号#分包商#探伤部位#RT数量 本月,累计#一次合格 本月,累计#一次合格率 本月,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -833,7 +873,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { projectStartDate = project.StartDate.Value; } - //当期集合 + //所有集合 List totalManagementList = BLL.NCRManagementService.GetNCRManagementListByDate(this.CurrUser.LoginProjectId, startDate, endDate); List unitNames = (from x in totalManagementList select x.ReceiveUnit).Distinct().ToList(); foreach (var item in unitNames) @@ -894,7 +934,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#接收单位#本周已完成#累计已完成#NCR总数#累计完成比例"; + string headerStr = "序号#接收单位#本月已完成#累计已完成#NCR总数#累计完成比例"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -975,7 +1015,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#专业#发布数量 本周,累计#业主批准数量 本周,累计#完成情况 本周,累计"; + string headerStr = "序号#专业#发布数量 本月,累计#业主批准数量 本月,累计#完成情况 本月,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -1008,7 +1048,6 @@ namespace FineUIPro.Web.CQMS.ManageReport 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) { @@ -1091,7 +1130,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (e.Row.RowType == DataControlRowType.Header) { - string headerStr = "序号#分包商#管道焊工 本周上岗,累计#钢结构焊工 本周上岗,累计#设备焊工 本周上岗,累计#其他 本周上岗,累计"; + string headerStr = "序号#分包商#管道焊工 本月上岗,累计#钢结构焊工 本月上岗,累计#设备焊工 本月上岗,累计#其他 本月上岗,累计"; DynamicTHeaderHepler dHelper = new DynamicTHeaderHepler(); dHelper.SplitTableHeader(e.Row, headerStr); } @@ -1162,9 +1201,9 @@ namespace FineUIPro.Web.CQMS.ManageReport #endregion - #region 下周质量控制重点 + #region 下月质量控制重点 /// - /// 增加下周质量控制重点 + /// 增加下月质量控制重点 /// /// /// @@ -1233,20 +1272,26 @@ namespace FineUIPro.Web.CQMS.ManageReport { if (!string.IsNullOrEmpty(this.txtStartDate.Text.Trim())) { - CheckLotBindStatisc("CV");//检验批统计:土建 - CheckLotBindStatisc("EQ");//检验批统计:设备 - CheckLotBindStatisc("PP");//检验批统计:管道 - CheckLotBindStatisc("EL");//检验批统计:电气 - CheckLotBindStatisc("IN");//检验批统计:仪表 - CheckLotBindStatisc("FF");//检验批统计:反腐 - CheckLotBindStatisc("XF");//检验批统计:消防 - GetComprehensive();//综合管理 - BindStatisc();//无损检测统计 - NCRBindStatisc();//NCR统计 - DesignChangeOrderBindStatisc();//设计变更统计 - PassWelderBindStatisc();//合格焊工统计 - ConstructionStatisticsr();//施工方案统计 - + //CheckLotBindStatisc("CV");//检验批统计:土建 + //CheckLotBindStatisc("EQ");//检验批统计:设备 + //CheckLotBindStatisc("PP");//检验批统计:管道 + //CheckLotBindStatisc("EL");//检验批统计:电气 + //CheckLotBindStatisc("IN");//检验批统计:仪表 + //CheckLotBindStatisc("FF");//检验批统计:反腐 + //CheckLotBindStatisc("XF");//检验批统计:消防 + //GetComprehensive();//综合管理 + //BindStatisc();//无损检测统计 + //NCRBindStatisc();//NCR统计 + //DesignChangeOrderBindStatisc();//设计变更统计 + //PassWelderBindStatisc();//合格焊工统计 + //ConstructionStatisticsr();//施工方案统计 + //Response.AddHeader("Refresh", "0"); + 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 @@ -1272,7 +1317,6 @@ namespace FineUIPro.Web.CQMS.ManageReport ScriptManager.RegisterStartupScript(this, typeof(string), "_alert", "alert('周期输入格式不正确，请重新输入！')", true); return; } - } if (!string.IsNullOrEmpty(this.txtStartDate.Text)) { @@ -1282,7 +1326,7 @@ namespace FineUIPro.Web.CQMS.ManageReport { report.EndDate = Convert.ToDateTime(this.txtEndDate.Text); } - report.ReportType = "1"; + report.ReportType = "2"; BLL.ThisWeekOrMonthContentService.DeleteThisWeekOrMonthContentByReportId(this.ReportId); BLL.RowMaterialProblemService.DeleteRowMaterialProbleByReportId(this.ReportId); @@ -1300,7 +1344,7 @@ namespace FineUIPro.Web.CQMS.ManageReport report.ReportId = this.ReportId; BLL.WeekAndMonthReportService.AddWeekAndMonthReport(report); } - //本周主要工作内容 + //本月主要工作内容 saveThisWeekAndMonthContent(); foreach (var item in thisWeekOrMonthContentLists) { @@ -1336,7 +1380,7 @@ namespace FineUIPro.Web.CQMS.ManageReport comprehensive.Others = this.txt9.Text.Trim(); BLL.ComprehensiveService.AddComprehensive(comprehensive); - //下周质量控制重点 + //下月质量控制重点 saveNextQualityControl(); foreach (var item in nextQualityControlLists) { @@ -1369,5 +1413,7 @@ namespace FineUIPro.Web.CQMS.ManageReport } #endregion + + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx index a80991ef..be853495 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DocManageEdit.aspx.cs" Inherits="FineUIPro.Web.DocManage.DocManageEdit" ValidateRequest="false" %> @@ -155,7 +155,7 @@ - @@ -179,16 +179,22 @@ - - - + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs index 2ee53dde..c55ac094 100644 --- a/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/DocManage/DocManageEdit.aspx.cs @@ -524,7 +524,7 @@ namespace FineUIPro.Web.DocManage approve1.ApproveMan = CurrUser.UserId; DocManageApproveService.AddDocManageApprove(approve1); } - //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); LogService.AddSys_Log(CurrUser, doc.DocCode, DocId, Const.DocManageMenuId, "编辑文档"); }