From fb98d990751e363288424793aab5d5b0615342d2 Mon Sep 17 00:00:00 2001 From: chi Date: Fri, 1 Sep 2023 16:12:25 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=8A=B9?= =?UTF-8?q?=EC=9D=B8=EB=90=9C=20=ED=9C=B4=EA=B0=80=20=EC=9E=90=EB=A3=8C?= =?UTF-8?q?=EB=8A=94=20=ED=8E=B8=EC=A7=91=ED=95=A0=20=EC=88=98=20=EC=97=86?= =?UTF-8?q?=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 ++-- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f1353de..76f3663 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.08.28.0900")] -[assembly: AssemblyFileVersion("23.08.28.0900")] +[assembly: AssemblyVersion("23.09.01.1600")] +[assembly: AssemblyFileVersion("23.09.01.1600")] diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 96672a0..2f099ca 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -121,6 +121,7 @@ namespace FPJ0000.OtConfirm grpAdmin.Enabled = false; grpAdmin.Text = "관리자(추가작업시에는 사용할 수 없습니다)"; UpdateStatus(); + button1.Enabled = true; } else { @@ -129,8 +130,23 @@ namespace FPJ0000.OtConfirm if (IsAdmin) { grpUser.Text = "신청자(편집상태에서는 사용자를 변경할 수 없습니다)"; + button1.Enabled = true; } + else + { + //관리자 승인된 자료는 업데이트하지 ㅇ낳는다. + if (dr.IsconfNull() || dr.conf == 0) + { + button1.Enabled = true; + } + else + { + //승인혹은 취소됨 + FCOMMON.Util.MsgI("관리자 승인/취소된 자료는 편집할 수 없습니다"); + button1.Enabled = false; + } + } var 관리자사전멘트 = FCOMMON.DBM.getCodeList("54"); cmbPreset.Items.Clear(); cmbPreset.Items.Add(" -- 저장된 문구를 선택하세요(공용:54) --"); @@ -484,7 +500,7 @@ namespace FPJ0000.OtConfirm radOut.BackColor = SystemColors.Control; groupBox1.Enabled = true; textBox1.Enabled = false; - + } else if (radOut.Checked) {