20250225 月报修改

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx

@@ -65,7 +65,8 @@
 
                                     <f:Button ID="Button2" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnSave_Click">
                                     </f:Button>
-
+                                     <f:Button ID="btnClose" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
+ </f:Button>
                                 </td>
                             </tr>
                         </table>
@@ -2085,6 +2086,9 @@
 
                         <f:Button ID="Button5" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" OnClick="btnLoad_Click" Hidden="true">
                         </f:Button>
+                        
+                                     <f:Button ID="Button6" Icon="SystemClose" runat="server" ToolTip="关闭" Text="关闭" OnClick="btnClose_Click">
+ </f:Button>
                         <f:HiddenField ID="hdId" runat="server">
                         </f:HiddenField>
                         <f:HiddenField ID="hdAttachUrl" runat="server">

SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs

@@ -1379,7 +1379,9 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 Grid10.Hidden = true;
                 hidWsjcgl.Hidden = false;
             }
-            else { 
+            else {
+                Grid10.Hidden = false;
+                hidWsjcgl.Hidden = true;
                 Grid10.DataSource = list;
                 Grid10.DataBind();
 
@@ -2866,7 +2868,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             SaveMethod();
 
             ShowNotify("编辑成功！", MessageBoxIcon.Success);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+            //PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
         }
 
         private void SaveMethod()
@@ -4108,5 +4110,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         {
             Session["_ViewState"] = viewState;
         }
+
+        protected void btnClose_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
     }
 }

SGGL/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>