From f33b4a57fb2d1d129f3d48fd848128ae72574080 Mon Sep 17 00:00:00 2001 From: kdh0120 Date: Thu, 2 Sep 2021 03:51:06 +0000 Subject: [PATCH] --- BO/Views/croom/Documents.cshtml | 11 ++++++----- BO/Views/user/asr.cshtml | 3 ++- Base/Controller/FCommon.cs | 2 +- Dao/MyBatis/Maps/CM.xml | 2 +- FO/Views/CDMS/Contents.cshtml | 2 +- FO/Views/Course/ApplyPay.cshtml | 2 +- FO/Views/My/Document.cshtml | 2 +- FO/Views/My/MyAssInfo.cshtml | 22 ++++++++++++++++++++-- FO/Views/My/MyInfoCheck.cshtml | 10 ++++++---- FO/css/mypage.css | 2 +- 10 files changed, 40 insertions(+), 18 deletions(-) diff --git a/BO/Views/croom/Documents.cshtml b/BO/Views/croom/Documents.cshtml index 14673ae..3272566 100644 --- a/BO/Views/croom/Documents.cshtml +++ b/BO/Views/croom/Documents.cshtml @@ -76,22 +76,22 @@ - @foreach(var d in Model.Lects) + @foreach (var d in Model.Lects) { - - @string.Format("{0}({1}){2}",d.username,d.userid,d.asname) + + @string.Format("{0}({1}){2}", d.username, d.userid, d.asname) @d.cname @d.cdtymd - @if(d.cshape != 0) + @if (d.cshape != 0) { [인쇄] } [인쇄] - @if(d.iscomplete == 1) + @if (d.iscomplete == 1) { [인쇄] } @@ -101,6 +101,7 @@ + @Html.Pager((int)Model.pagenum, 10, Model.pagerowcount, Model.pagetotalcount)
diff --git a/BO/Views/user/asr.cshtml b/BO/Views/user/asr.cshtml index b3424fe..db88fee 100644 --- a/BO/Views/user/asr.cshtml +++ b/BO/Views/user/asr.cshtml @@ -73,7 +73,7 @@ 기본담당자연락처 - @Html.TextBoxFor(m => m.Assign.mphone, new { @class = "form-control mobilefmt nocomma", @data_zero = "1", @maxlength = "13" }) + @Html.TextBoxFor(m => m.Assign.mphone, new { @class = "form-control telnofmt nocomma", @data_zero = "1", @maxlength = "13" }) 계산서이메일 @@ -131,6 +131,7 @@ setv("Assign_brno", val("Assign_brno").replace(/-/gi, '')); setv("Assign_grno", val("Assign_grno").replace(/-/gi, '')); if (check("Assign_asname", null, "법인명을 입력해주세요.")) { } + else if (val("Assign_mphone") != "" && !isphone(val("Assign_mphone"))) { msg("잘못된 연락처입니다."); } else if (confirm("저장하시겠습니까?")) { capfileform("/acommon/assignsave", "mform", "cbsave"); } diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs index 914d637..584d3c6 100644 --- a/Base/Controller/FCommon.cs +++ b/Base/Controller/FCommon.cs @@ -78,7 +78,7 @@ namespace NP.Base.Controllers [HttpPost] public JsonResult AssignSave(String brno, String asname, String ceoname) { - var ht = new Hashtable() { { "asno", 0 }, { "isjoin", 0 }, { "joinprice", 0 }, { "asname", asname }, { "brno", brno.Replace("-", "") }, { "ceoname", ceoname }, { "salesamount", 0 }, { "mcount", 0 }, { "status", 1 }, { "isdel", 0 }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }; + var ht = new Hashtable() { { "asno", 0 }, { "isjoin", 0 }, { "ascode", Dao.Get("users.assign.newascode", 1).First() }, { "joinprice", 0 }, { "asname", asname }, { "brno", brno.Replace("-", "") }, { "ceoname", ceoname }, { "salesamount", 0 }, { "mcount", 0 }, { "status", 1 }, { "isdel", 0 }, { "uno", SUserInfo.UserNo }, { "uip", GetUserIP() } }; Dao.Insert("users.assign.in", ht); return JsonOK(GetInt(ht["asno"])); } diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index d2bb0e7..c66523c 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1939,7 +1939,7 @@ ,brno =#brno# ,post =#post# ,address1=#address1# - ,address2=#address2# + ,address2=#address2# ,btype =#btype# ,bkind =#bkind# ,fgnobno=#fgnobno# diff --git a/FO/Views/CDMS/Contents.cshtml b/FO/Views/CDMS/Contents.cshtml index ca91b40..7202745 100644 --- a/FO/Views/CDMS/Contents.cshtml +++ b/FO/Views/CDMS/Contents.cshtml @@ -4,7 +4,7 @@ }
-

콘텐츠 플레이어

+

※ 반드시 학습종료 버튼을 눌러 종료해주세요. ※

닫기
diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 0b6352a..898a997 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -184,7 +184,7 @@ function save() { var isCompanyInfo = true; $.each(model.pplog, function (key, value) { - if (!value) { + if (!value && key != "address2") { isCompanyInfo = false; return; } diff --git a/FO/Views/My/Document.cshtml b/FO/Views/My/Document.cshtml index 6773cdf..da1d161 100644 --- a/FO/Views/My/Document.cshtml +++ b/FO/Views/My/Document.cshtml @@ -572,7 +572,7 @@ else else if (!isemail(val("email"))) { msg("이메일 형식이 올바르지 않습니다. 다시 입력해주세요."); } else if (check("post", null, "사업장주소를 입력해주세요.")) { } else if (check("address1", null, "사업장주소를 입력해주세요.")) { } - else if (check("address2", null, "사업장주소를 입력해주세요.")) { } + //else if (check("address2", null, "사업장주소를 입력해주세요.")) { } else { setv("asaddr", $("#address1").val() + " " + $("#address2").val() ) confirmtoggle(true, "계산서발행요청 이후, 수정 및 철회는 고객문의 게시판을 이용해주십시오. 계산서 발행 요청을 완료하시겠습니까?", "gogo()"); diff --git a/FO/Views/My/MyAssInfo.cshtml b/FO/Views/My/MyAssInfo.cshtml index 87a1916..802be62 100644 --- a/FO/Views/My/MyAssInfo.cshtml +++ b/FO/Views/My/MyAssInfo.cshtml @@ -72,6 +72,24 @@
  • + *@
    • diff --git a/FO/css/mypage.css b/FO/css/mypage.css index 29a2a9c..af2ee69 100644 --- a/FO/css/mypage.css +++ b/FO/css/mypage.css @@ -896,7 +896,7 @@ .mpgpMdfy {padding:30px;} .mpgpMdfy dl {padding:20px; background:#ecf4fb;} -.mpgpMdfy dl dd {font-size:11pt; color:#000; margin-bottom:5px; font-weight:300;} +.mpgpMdfy dl dd {font-size:14pt; color:#000; margin-bottom:5px; font-weight:300; line-height:35px;} .mpgpMdfy dl dd:last-child {margin-bottom:0;} .mpgpMdfy h5 {color:#1e52bd; font-size:14pt; margin-top:30px; margin-bottom:10px; text-align:center;} .mpgpMdfy textarea {display:block; width:100%; height:180px; resize:none;}