From 88067caa9c86e8404aac46a912efa661172cb3a1 Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Wed, 11 Dec 2024 09:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE=E4=BA=8B?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  2 +-
 .../PZHGL/GJSX/GJSXListEdit.aspx.cs           | 43 ++++++++++++++++---
 2 files changed, 37 insertions(+), 8 deletions(-)

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">
diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
index 0c430548..ea696586 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
@@ -345,6 +345,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
                         }
 
                         if (state == "0") {
+                            Grid2.AllColumns[0].Hidden = true;
+                            Grid2.AllColumns[5].Hidden = true;
+                            Grid2.AllColumns[6].Hidden = false;
+                            Grid2Binging();
                             Button1.Hidden = true;
                         }
                         //rblIsClosed.Visible = false;
@@ -792,19 +796,44 @@ namespace FineUIPro.Web.PZHGL.GJSX
 
             string EditType = Request.Params["EditType"];
 
-            if (EditType == "add")
+            string ID = Request.Params["ID"];
+            if (string.IsNullOrEmpty(ID))
             {
                 save("2");
             }
-            else {
-                //责任人的时候保存关键事项
-                var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
-                if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
+            else
+            {
+                var model = GJSXService.GetGJSXById(ID);
+                var state = model.State.Trim();
+                if (state == "1")
                 {
-                    save("3");
-                    OperateComplianceObligationsCSort();
+                    save("2");
+                }
+                else {
+                    //责任人的时候保存关键事项
+                    var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
+                    if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
+                    {
+                        save("3");
+                        OperateComplianceObligationsCSort();
+                    }
                 }
             }
+
+            //if (EditType == "add")
+            //{
+            //    save("2");
+            //}
+            //else {
+               
+            //    //责任人的时候保存关键事项
+            //    var gjsx = BLL.GJSXService.GetGJSXById(txtGJSXID.Text);
+            //    if (gjsx.User_Acceptance.Contains(this.CurrUser.UserId))
+            //    {
+            //        save("3");
+            //        OperateComplianceObligationsCSort();
+            //    }
+            //}
             
             
             PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());