From 2f87f6af53a1264162d0abd83982482b70005522 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Sun, 28 Apr 2024 17:48:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Web.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index eafda425..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + From 1a2bcf6e3f7dc6f8632dd4aa26233b5f3a5ec9d0 Mon Sep 17 00:00:00 2001 From: panhf <754998852@qq.com> Date: Mon, 29 Apr 2024 09:30:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManageReportNew/MonthReportEdit.aspx.cs | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs index 4ae5d19a..9ea69f95 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs @@ -1055,17 +1055,21 @@ namespace FineUIPro.Web.CQMS.ManageReportNew { DataTable source = ObjectToTable(Grid9.DataSource); int Quantity1Total = 0, Quantity2Total = 0; - foreach (DataRow row in source.Rows) + if (source!=null) { - Quantity1Total += Convert.ToInt32(row["Quantity1"]); - Quantity2Total += Convert.ToInt32(row["Quantity2"]); - } + foreach (DataRow row in source.Rows) + { + Quantity1Total += Convert.ToInt32(row["Quantity1"]); + Quantity2Total += Convert.ToInt32(row["Quantity2"]); + } - JObject summary = new JObject(); - summary.Add("UnitOrMajor", "合计"); - summary.Add("Quantity1", Quantity1Total.ToString()); - summary.Add("Quantity2", Quantity2Total.ToString()); - Grid9.SummaryData = summary; + JObject summary = new JObject(); + summary.Add("UnitOrMajor", "合计"); + summary.Add("Quantity1", Quantity1Total.ToString()); + summary.Add("Quantity2", Quantity2Total.ToString()); + Grid9.SummaryData = summary; + } + } public static DataTable ObjectToTable(object obj) From dc62762f1078925e8e96c06ab7cd4df4c9c26aba Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 29 Apr 2024 09:50:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Web.config | 2 +- SGGL/FineUIPro.Web/common/main_new.aspx | 4 +- SGGL/Model/Model.cs | 1913 ++++++++++------------- 3 files changed, 801 insertions(+), 1118 deletions(-) diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index f50b26d3..963148f2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -77,7 +77,7 @@ - + diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx b/SGGL/FineUIPro.Web/common/main_new.aspx index 5797a135..5cd7f954 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx +++ b/SGGL/FineUIPro.Web/common/main_new.aspx @@ -107,8 +107,8 @@ -
-
关键事项 更多>
+
+
关键事项 更多>