From be1a3b7b3224070dd20c824cda035d86575cec97 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Mon, 25 Nov 2024 17:52:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E6=9C=88=E6=8A=A5=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManageReportNew/MonthReportEdit.aspx.cs   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index c4149d2b..d451cdfa 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -65,6 +65,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #endregion
 
         #region 加载所有单位
+        [Serializable]
         public class UnitClass {
             public string UnitId { get; set; }
             public string UnitName { get; set; }
@@ -72,16 +73,40 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
             public string UnitType { get; set; }
         }
 
-        public List<UnitClass> units = new List<UnitClass>();
+        //public List<UnitClass> units = new List<UnitClass>();
+
+        public List<UnitClass> units
+        {
+            get
+            {
+                return (List<UnitClass>)ViewState["units"];
+            }
+            set
+            {
+                ViewState["units"] = value;
+            }
+        }
         #endregion
 
         #region 加载所有专业
+        [Serializable]
         public class ProfessionalsClass {
             public string CNProfessionalId { get; set; }
             public string ProfessionalName { get; set; }
         }
 
-        public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>();
+        //public List<ProfessionalsClass> CNProfessionals = new List<ProfessionalsClass>();
+        public List<ProfessionalsClass> CNProfessionals
+        {
+            get
+            {
+                return (List<ProfessionalsClass>)ViewState["CNProfessionals"];
+            }
+            set
+            {
+                ViewState["CNProfessionals"] = value;
+            }
+        }
         #endregion
 
         #region 加载页面

From 3cdd291adac91cc6bd08735ce154c9175f7980e8 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Tue, 26 Nov 2024 10:23:36 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=9C=88=E6=8A=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SUBQHSE_V2024-11-26-phf.sql | 12 ++++++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 DataBase/版本日志/SUBQHSE_V2024-11-26-phf.sql

diff --git a/DataBase/版本日志/SUBQHSE_V2024-11-26-phf.sql b/DataBase/版本日志/SUBQHSE_V2024-11-26-phf.sql
new file mode 100644
index 00000000..44166663
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2024-11-26-phf.sql
@@ -0,0 +1,12 @@
+
+alter table Report_ConstructionProblems
+alter column ProblemDesrioption nvarchar(2000) null;
+
+alter table Report_ConstructionProblems
+alter column TreatmentMeasures nvarchar(2000) null;
+
+alter table Report_RowMaterialProblem
+alter column ProblemDesrioption nvarchar(2000) null;
+
+alter table Report_RowMaterialProblem
+alter column TreatmentMeasures nvarchar(2000) null;
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 11c97548..bf5001d2 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19321,7 +19321,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From 83c4ba754063a6d17e7cbea0c7120389803c88c1 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 28 Nov 2024 10:18:58 +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/FineUIPro.Web.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 29220861..fec7f569 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19232,7 +19232,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">