From cf47e78b85c3a8e839ff561e6c8a29f8e1d89f8f Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 19 Nov 2025 20:34:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E6=8F=90=E5=87=BA=E4=BA=BA=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E9=A1=B9=E7=B4=A7=E6=80=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PZHGL/GJSX/GJSXListEdit.aspx.cs           | 79 ++++++++++++-------
 SGGL/WebAPI/WebAPI.csproj.user                |  2 +-
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
index c726eb9e..06bb5bfb 100644
--- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
@@ -383,10 +383,26 @@ namespace FineUIPro.Web.PZHGL.GJSX
                     }
 
                     btnSave.Visible = false;
-                    if (gjsx.UserID == this.CurrUser.UserId && state == "1")
+                    if (gjsx.UserID == this.CurrUser.UserId)
                     {
-                        Date_CreateDate.Readonly = true;
+                        if (state == "1")
+                        {
+                            Date_CreateDate.Readonly = true;
+                        }
+                        else
+                        {
+                            TextIsEnable(false); //使文本不可编辑
+                            if (state != "0")
+                            {
+                                DropQuestionTypeID.Enabled = true;
+                                btnsubmit.Hidden = false;
+                            }
+                        }
                     }
+                    //if (gjsx.UserID == this.CurrUser.UserId && state == "1")
+                    //{
+                    //    Date_CreateDate.Readonly = true;
+                    //}
                     else
                     {
                         TextIsEnable(false); //使文本不可编辑
@@ -854,34 +870,41 @@ namespace FineUIPro.Web.PZHGL.GJSX
                     //else 
                     if (gjsx.UserID.Contains(this.CurrUser.UserId) || gjsx.User_ReceiveID.Contains(this.CurrUser.UserId))
                     {//提出人、跟踪人审批责任人提出申请关闭请求 
-                        //进展状态
-                        string progressResult = this.rblProgressResult.SelectedValue;
-                        if (progressResult == "0")
-                        {//同意申请关闭
-                            save("0");
-                        }
-                        else if (progressResult == "1")
-                        {//驳回申请关闭
-                            save("2");
-                        }
-
-                        string progressReason = this.txtProgressReason.Text.Trim();
-                        Model.GJSX_detail detail = new Model.GJSX_detail
+                        if (ApproveForm.Hidden == true)
                         {
-                            Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
-                            GJSXID = txtGJSXID.Text,
-                            Progress_user = this.CurrUser.UserId,
-                            Progress_detail = $"{(progressResult == "0" ? "同意" : "驳回")}申请关闭{(!string.IsNullOrWhiteSpace(progressReason) ? "：" : "")}{progressReason}",
-                            Date = DateTime.Now,
-                            //Sort = GJSX_detail.Count,
-                            ProgressStatus = $"{(progressResult == "0" ? "同意" : "驳回")}申请",
-                        };
-                        GJSXItemService.AddGJSXMX(detail);
-
-                        //事项申请关闭被驳回，邮箱提醒
-                        if (progressResult == "1")
+                            save(model.State);
+                        }
+                        else
                         {
-                            GJSXMonitorService.GJSXDisallowApplyCloseNoticeSendEmail(detail.GJSXID, progressReason);
+                            //进展状态
+                            string progressResult = this.rblProgressResult.SelectedValue;
+                            if (progressResult == "0")
+                            {//同意申请关闭
+                                save("0");
+                            }
+                            else if (progressResult == "1")
+                            {//驳回申请关闭
+                                save("2");
+                            }
+
+                            string progressReason = this.txtProgressReason.Text.Trim();
+                            Model.GJSX_detail detail = new Model.GJSX_detail
+                            {
+                                Cuid = SQLHelper.GetNewID(typeof(Model.GJSX_detail)),
+                                GJSXID = txtGJSXID.Text,
+                                Progress_user = this.CurrUser.UserId,
+                                Progress_detail = $"{(progressResult == "0" ? "同意" : "驳回")}申请关闭{(!string.IsNullOrWhiteSpace(progressReason) ? "：" : "")}{progressReason}",
+                                Date = DateTime.Now,
+                                //Sort = GJSX_detail.Count,
+                                ProgressStatus = $"{(progressResult == "0" ? "同意" : "驳回")}申请",
+                            };
+                            GJSXItemService.AddGJSXMX(detail);
+
+                            //事项申请关闭被驳回，邮箱提醒
+                            if (progressResult == "1")
+                            {
+                                GJSXMonitorService.GJSXDisallowApplyCloseNoticeSendEmail(detail.GJSXID, progressReason);
+                            }
                         }
                     }
                 }
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 1a1a9a6c..17978b44 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />