From a9be605aa5efc5c398aa5d34e971d01a53e250e9 Mon Sep 17 00:00:00 2001
From: swpark <swpark  @example.com>
Date: Tue, 21 Dec 2021 04:36:10 +0000
Subject: [PATCH] =?UTF-8?q?<=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 결재내역 관련이슈

 - 관리자 > 교육운영 > 결제내역 > 기본정보 탭

 1) 계산서 신청이 없는 경우 계산서확인 칸에 '-' 로 출력 ()

 2) 최종합계 행 틀어짐 현상 수정 요청

 3) 교육신청내역 [수정]버튼을 클릭시 나오는 팝업 내 교육기간 변경 부분을 '숨김(display none)' 처리
  (교육운영>수강신청>상세>교육생명 클릭 => 교육생정보 팝업 도 동일처리 요청)

# 커밋 파일
BO\Views\croom\cmlects.cshtml
BO\Views\croom\payview.cshtml
Model\Pay.cs

# 테스트 결과
- 이상없음

# 특이사항 및 이슈사항
- 이상없음
---
 BO/Views/croom/cmlects.cshtml | 2 +-
 BO/Views/croom/payview.cshtml | 6 +++---
 Model/Pay.cs                  | 5 +++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/BO/Views/croom/cmlects.cshtml b/BO/Views/croom/cmlects.cshtml
index 322f4cd..1a0a788 100644
--- a/BO/Views/croom/cmlects.cshtml
+++ b/BO/Views/croom/cmlects.cshtml
@@ -167,7 +167,7 @@
         <tr><th>직위</th><td id="positiondepart"></td></tr>
         <tr><th>이메일</th><td id="email"></td></tr>
         <tr><th>휴대전화번호</th><td id="mobile"></td></tr>
-        <tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>
+        @*<tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>*@
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>경력증명서</th><td id="filelist"></td></tr>
         <tr class="trhidebox" style="@(Model.CM.certcc == null ? "display: none;":"")"><th>심사여부</th><td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "3:신청중;4:승인;5:미승인" }, { "checked", 3 }, { "name", "status" } })</td></tr>
         <tr>
diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml
index 2071ad4..64e92f5 100644
--- a/BO/Views/croom/payview.cshtml
+++ b/BO/Views/croom/payview.cshtml
@@ -191,9 +191,9 @@
             }
             @if (p.isdvr == 1)
             {
-                <tr><td class="left" colspan="7">- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")</td></tr>
+                <tr><td class="left" colspan="8">- 택배비 : @(p.deliamt > 0 ? (p.deliamt.ToString("#,0") + " 원") : "직접수령")</td></tr>
             }
-            <tr><td class="left" colspan="7">- 최종합계: @p.payamt.ToString("#,0") 원</td></tr>
+            <tr><td class="left" colspan="8">- 최종합계: @p.payamt.ToString("#,0") 원</td></tr>
         </table>
         @if (isexamready)
         {
@@ -344,7 +344,7 @@
         <tr><th>직위</th><td id="positiondepart"></td></tr>
         <tr><th>이메일</th><td id="email"></td></tr>
         <tr><th>휴대전화번호</th><td id="mobile"></td></tr>
-        <tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>        
+        @*<tr><th>교육기간</th><td>@Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "sdate" } }) ~ @Html.Partial("./Partial/Date", (DateTime?)null, new ViewDataDictionary { { "name", "edate" } })<a href="#" id="btnchange" class="btn btn-info" onclick="change();">저장</a></td></tr>*@        
         <tr>
             <th>기술인분류</th>
             <td>
diff --git a/Model/Pay.cs b/Model/Pay.cs
index 499f191..32289d6 100644
--- a/Model/Pay.cs
+++ b/Model/Pay.cs
@@ -45,6 +45,11 @@ namespace NP.Model
         {
             get
             {
+                if (taxtypename.Equals("-"))
+                {
+                    return "-";
+                }
+
                 return ischeck == 1  ? "확인" : "미확인";
             }
         }