diff --git a/BO/Controllers/croomController.cs b/BO/Controllers/croomController.cs index d9d1086..aa6d8a2 100644 --- a/BO/Controllers/croomController.cs +++ b/BO/Controllers/croomController.cs @@ -919,6 +919,9 @@ namespace NP.BO.Controllers ht.Add("pstatus", vm.stringval10); ht.Add("taxnos", vm.stringval11); ht.Add("ischeck", vm.stringval12); + ht.Add("csdate", vm.stringval13); + ht.Add("cedate", string.IsNullOrEmpty(vm.stringval14) ? null : (vm.stringval14 + " 23:59:59")); + ht.Add("isreceipt", vm.stringval15); if (!string.IsNullOrEmpty(vm.stringval3)) { if(vm.stringval3 == "2") diff --git a/BO/Views/croom/tax.cshtml b/BO/Views/croom/tax.cshtml index f744dd8..7df530f 100644 --- a/BO/Views/croom/tax.cshtml +++ b/BO/Views/croom/tax.cshtml @@ -17,33 +17,38 @@
| 계산서 요청날짜 | -- @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } }) - | -|||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| 신청일 | @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval) ? (DateTime?)null : Convert.ToDateTime(Model.stringval), new ViewDataDictionary { { "name", "stringval" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval2) ? (DateTime?)null : Convert.ToDateTime(Model.stringval2), new ViewDataDictionary { { "name", "stringval2" } }) | +계산서 요청날짜 | ++ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval7) ? (DateTime?)null : Convert.ToDateTime(Model.stringval7), new ViewDataDictionary { { "name", "stringval7" } }) + | |||||||
| 계산서 실제 날짜 | @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval8) ? (DateTime?)null : Convert.ToDateTime(Model.stringval8), new ViewDataDictionary { { "name", "stringval8" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval9) ? (DateTime?)null : Convert.ToDateTime(Model.stringval9), new ViewDataDictionary { { "name", "stringval9" } }) | +계산서 확인 날짜 | ++ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval13) ? (DateTime?)null : Convert.ToDateTime(Model.stringval13), new ViewDataDictionary { { "name", "stringval13" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval14) ? (DateTime?)null : Convert.ToDateTime(Model.stringval14), new ViewDataDictionary { { "name", "stringval14" } }) + | |||||||
| 검색어 | -+ | @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":발행상태;0:미발행;3:미발행(임시저장);1:발행;2:발행취소" }, { "name", "stringval3" }, { "selected", Model.stringval3 } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":결제상태;p21:결제대기;p22:입금대기;p1:결제완료;rf1:환불요청;r1:부분환불;r2:전액환불;p41,42,43:결제취소" }, { "name", "stringval10" }, { "selected", Model.stringval10 } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":확인상태;1:확인;0:미확인" }, { "name", "stringval12" }, { "selected", Model.stringval12 } }) + @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":영수구분;1:영수;0:청구" }, { "name", "stringval15" }, { "selected", Model.stringval15 } }) @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":전체검색;username:신청자이름;userid:신청자ID;manname:담당자이름;itemname:상품명;cname:교육과정명;paynos:결제번호;asname:회사명" }, { "name", "stringval4" }, { "selected", Model.stringval4 } }) @Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "", CssClass = "ff" })) @Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" }) @@ -82,7 +87,8 @@ | 발행한날 | 영수구분 | 상태 | -확인상태 | +확인상태 | +확인날짜 | @(d.isreceipt == 0 ? "청구" : "영수") | @(d.status) | @(d.ischeckname) | +@d.checktimeymd | } diff --git a/BO/Views/croom/taxdetail.cshtml b/BO/Views/croom/taxdetail.cshtml index 8cdc38e..df9cce8 100644 --- a/BO/Views/croom/taxdetail.cshtml +++ b/BO/Views/croom/taxdetail.cshtml @@ -31,6 +31,7 @@영수구분 | 상태 | 확인상태 | +확인날짜 | @@ -51,6 +52,7 @@@(d.isreceipt == 0 ? "청구" : "영수") | @(d.status) | @(d.ischeckname) | +@d.checktimeymd | } diff --git a/BO/Views/user/assigns.cshtml b/BO/Views/user/assigns.cshtml index a2f7cd4..f32050d 100644 --- a/BO/Views/user/assigns.cshtml +++ b/BO/Views/user/assigns.cshtml @@ -8,7 +8,6 @@