From 84a238b2546b6b4b80f4b03f6377ef4aec93c0dd Mon Sep 17 00:00:00 2001 From: lch Date: Tue, 22 Jun 2021 02:25:36 +0000 Subject: [PATCH] =?UTF-8?q?+=20=EA=B5=90=EC=9C=A1=EC=8B=A0=EC=B2=AD=20=20?= =?UTF-8?q?=20=20=20-=20=EA=B3=A0=EC=9A=A9=EB=B3=B4=ED=97=98=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EB=B2=88=ED=98=B8=20=EC=9C=84=EC=B9=98=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=20=20=20=20=20=20=20=20=EA=B8=B0=EC=A1=B4:=20?= =?UTF-8?q?=ED=9A=8C=EC=82=AC=EC=A0=95=EB=B3=B4=ED=99=95=EC=9D=B8=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=EB=B3=80=EA=B2=BD:=20=ED=99=98=EA=B8=89?= =?UTF-8?q?=EA=B8=88=20=EC=88=98=EB=A0=B9=EA=B3=84=EC=A2=8C=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D-=EC=98=88=EA=B8=88=EC=A3=BC=20=EC=95=84=EB=9E=98=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20*=20=EA=B3=A0=EC=9A=A9=EB=B3=B4?= =?UTF-8?q?=ED=97=98=EA=B4=80=EB=A6=AC=EB=B2=88=ED=98=B8=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=ED=94=84=EB=9D=BC=EC=9D=B8=EA=B0=95=EC=A2=8C-?= =?UTF-8?q?=ED=99=98=EA=B8=89=20=EC=84=A0=ED=83=9D=EC=8B=9C=EC=97=90?= =?UTF-8?q?=EB=A7=8C=20=EB=85=B8=EC=B6=9C=EB=90=98=EC=96=B4=EC=95=BC=20?= =?UTF-8?q?=ED=95=A8=20=20=20=20=20-=20=ED=9A=8C=EC=82=AC=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=ED=99=95=EC=9D=B8=20=EB=B6=80=EB=B6=84=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=8B=B4=EB=8B=B9=EC=9E=90=EC=84=B1=EB=AA=85/?= =?UTF-8?q?=EB=8B=B4=EB=8B=B9=EC=9E=90=EC=97=B0=EB=9D=BD=EC=B2=98=20?= =?UTF-8?q?=ED=95=84=EC=88=98=EA=B0=92=20=EC=A0=9C=EC=99=B8=20=20=20=20=20?= =?UTF-8?q?-=20=EA=B8=B0=EC=A1=B4=20=ED=9A=8C=EC=82=AC=EC=A0=95=EB=B3=B4(A?= =?UTF-8?q?ssign)=20:=20=EA=B3=B5=EB=9E=80=EC=9D=BC=EC=8B=9C=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=A0=9C=EC=99=B8=20=20=20=20=20?= =?UTF-8?q?-=20=EC=8B=A0=EC=B2=AD=EC=A0=95=EB=B3=B4(pplog)=20:=20=EA=B3=B5?= =?UTF-8?q?=EB=9E=80=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=EC=84=9C=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dao/MyBatis/Maps/CM.xml | 20 +++---- .../PublishProfiles/FolderProfile.pubxml | 16 ++++++ FO/Views/Course/ApplyEdu.cshtml | 57 +++++++++---------- FO/Views/Course/ApplyPay.cshtml | 2 +- 4 files changed, 54 insertions(+), 41 deletions(-) create mode 100644 FO/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index 7ae5924..1de780c 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1898,16 +1898,16 @@ ,asname=#asname# ,ceoname=#ceoname# ,brno =#brno# - ,post =#post# - ,address1=#address1# - ,address2=#address2# - ,btype =#btype# - ,bkind =#bkind# + ,post =#post# + ,address1=#address1# + ,address2=#address2# + ,btype =#btype# + ,bkind =#bkind# ,fgnobno=#fgnobno# - ,eino=#eino# - ,mname=#mname# - ,mphone =case when #mphone# is not null then HEX(AES_ENCRYPT(#mphone#, )) else mphone end - ,taxemail =case when #taxemail# is not null then HEX(AES_ENCRYPT(#taxemail#, )) else taxemail end + ,eino=#eino# + ,mname=#mname# + ,mphone =case when #mphone# is not null then HEX(AES_ENCRYPT(#mphone#, )) else mphone end + ,taxemail =case when #taxemail# is not null then HEX(AES_ENCRYPT(#taxemail#, )) else taxemail end where asno=#asno# @@ -1919,7 +1919,7 @@ ,post =case when #upost# is not null then #upost# else post end ,address1 =case when #uaddress1# is not null then #uaddress1# else address1 end ,address2 =case when #uaddress2# is not null then #uaddress2# else address2 end - ,uduty = #uduty# + ,uduty = #uduty# ,slevel = #slevel# ,isassignuser = #isassignuser# where userno=#userno# diff --git a/FO/Properties/PublishProfiles/FolderProfile.pubxml b/FO/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..806ac6b --- /dev/null +++ b/FO/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,16 @@ + + + + + False + False + True + Release + Any CPU + FileSystem + bin\app.publish\ + FileSystem + + \ No newline at end of file diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index e43415b..ed08755 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -166,6 +166,10 @@ 예금주 + + 고용보험관리번호 + +

※ 환급금액 지급받는 계좌이므로 반드시 소속된 사업장의 법인계좌정보만 입력하여 주시기 바랍니다. (개인계좌 또는 사업주 개인의 계좌로는 환급이 불가합니다)

@@ -179,6 +183,7 @@

*는 필수 입력사항입니다.

계산서 발급을 원할 경우 담당자성명, 담당자연락처를 제외한 모든 사항 필수 입력을 해주세요.

@Html.HiddenFor(x => x.Assign.asno) + @Html.HiddenFor(x => x.Assign.eino) @@ -222,11 +227,7 @@ - - - - - + @@ -407,9 +408,7 @@ model.assign = @Html.Raw(Json.Encode(new List() { Model.Assign }.Select(s => new { s.asno, s.asname }).First()));; model.pplog = @Html.Raw(Json.Encode(new List() { ( Model.PPLog != null ? Model.PPLog : new NP.Model.PPLog {}) }.Select(s => new { s.isrebate, s.isaccommodation, s.cmisno }).First()));; model.selMonth = @(Model.selMonth != null ? Model.selMonth.ToString() : "null"); - model.iscompany = @(Model.isCompany != null ? Model.isCompany.ToString() : "null"); - model.isonline = "@(Model.CM.cshape)" == "1" ? false : true; - + model.iscompany = @(Model.isCompany != null ? Model.isCompany.ToString() : "null"); $(document).ready(function () { $(".div-companyInfo").find(".clsTable").find("tr th").removeClass("req"); @@ -553,6 +552,7 @@ setv("Assign_btype", capResult.obj.btype); setv("Assign_bkind", capResult.obj.bkind); setv("Assign_eino", capResult.obj.eino); + setv("eino", capResult.obj.eino); setv("Assign_mname", capResult.obj.mname); setv("Assign_mphone1", mphone1); setv("Assign_mphone2", mphone2); @@ -561,7 +561,6 @@ setv("Assign_taxemail2", taxemail2); } } - function setScd() { capp("/focommon/GetScdForMixEdu", { cmno: model.cm.cmno, month: $("#selMonth").val() }, "renderScd"); } @@ -607,40 +606,38 @@ $("input:radio[name='rdoScds'][value='" + model.pplog.cmisno + "']").click(); } } - function applyEdu() { var isrebate = $("input:radio[name='isrebate']:checked").val() == "1" ? true : false; - var isCompany = $("input:radio[name='isCompany']:checked").val() == "1" ? true : false; - var assign_mphone = val("Assign_mphone1").replace(/ /, '').replace(/ /, '') + val("Assign_mphone2").replace(/ /, '').replace(/ /, '') + val("Assign_mphone3").replace(/ /, '').replace(/ /, ''); + var isCompany = $("input:radio[name='isCompany']:checked").val() == "1" ? true : false; var assign_taxemail = val("Assign_taxemail1") + "@@" + val("Assign_taxemail2"); var user_mobile = val("User_mobile1").replace(/ /, '').replace(/ /, '') + val("User_mobile2").replace(/ /, '').replace(/ /, '') + val("User_mobile3").replace(/ /, '').replace(/ /, ''); var user_email = val("User_email1") + "@@" + val("User_email2"); var isCompanyInfoCheck = false; - if (isrebate) { + if (isrebate || isCompany) { isCompanyInfoCheck = true; } - else if (isCompany) { - isCompanyInfoCheck = true; + if (isrebate && getBytes(val("eino")) == 11) { + setv("Assign_eino", val("eino")); } if (isrebate && check("rbankname", null, "은행명을 등록해주세요.")) { } - else if (isrebate && check("rbankacc", null, "계좌번호를 등록해주세요.")) { } + else if (isrebate && check("rbankacc", null, "계좌번호를 등록해주세요.")) { } else if (isrebate && check("rbankowner", null, "예금주를 등록해주세요.")) { } - else if (isCompanyInfoCheck && model.isonline && check("Assign_asname", null, "회사명을 등록해주세요.")) { } - else if (isCompanyInfoCheck && model.isonline && check("Assign_brno", null, "사업자등록번호를 등록해주세요.")) { } - else if (isCompanyInfoCheck && model.isonline && getBytes(val("Assign_brno")) != 10) { focus("Assign_brno"); msg("10자리의 사업자번호를 등록해주세요."); } - else if (isCompanyInfoCheck && model.isonline && check("Assign_ceoname", null, "대표자성명을 등록해주세요.")) { } - else if (isCompanyInfoCheck && !model.isonline && (check("Assign_post", null, "우편번호를 등록해주세요.") || check("Assign_address1", null, "주소를 등록해주세요.") || check("Assign_address2", null, "상세주소를 등록해주세요."))) { } - else if (isCompanyInfoCheck && !model.isonline && check("Assign_btype", null, "업태를 등록해주세요.")) { } - else if (isCompanyInfoCheck && !model.isonline && check("Assign_bkind", null, "종목을 등록해주세요.")) { } - else if (isCompanyInfoCheck && !model.isonline && check("Assign_eino", null, "고용보험관리번호를 등록해주세요.")) { } - else if (isCompanyInfoCheck && !model.isonline && getBytes(val("Assign_eino")) != 11) { focus("Assign_eino"); msg("11자리의 고용보험관리번호를 등록해주세요."); } - //else if (isCompanyInfoCheck && check("Assign_mname", null, "담당자성명을 등록해주세요.")) { } - //else if (isCompanyInfoCheck && (check("Assign_mphone1", null, "담당자연락처를 등록해주세요.") || check("Assign_mphone2", null, "담당자연락처를 등록해주세요.") || check("Assign_mphone3", null, "담당자연락처를 등록해주세요."))) { } - //else if (isCompanyInfoCheck && !ismobilenumber(assign_mphone)) { focus("Assign_mphone1"); msg("담당자연락처를 확인해주세요."); } - else if (isCompanyInfoCheck && !model.isonline && (check("Assign_taxemail1", null, "계산서받을 이메일을 등록해주세요.") || check("Assign_taxemail2", null, "계산서받을 이메일을 등록해주세요."))) { } - else if (isCompanyInfoCheck && !model.isonline && !isemail(assign_taxemail)) { focus("Assign_taxemail1"); msg("올바른 이메일주소를 입력해주세요."); } + else if (isrebate && check("eino", null, "고용보험관리번호를 등록해주세요.")) { } + else if (isrebate && getBytes(val("eino")) != 11) { focus("eino"); msg("11자리의 고용보험관리번호를 등록해주세요."); } + + else if (isCompanyInfoCheck && check("Assign_asname", null, "회사명을 등록해주세요.")) { } + else if (isCompanyInfoCheck && check("Assign_brno", null, "사업자등록번호를 등록해주세요.")) { } + else if (isCompanyInfoCheck && getBytes(val("Assign_brno")) != 10) { focus("Assign_brno"); msg("10자리의 사업자번호를 등록해주세요."); } + else if (isCompanyInfoCheck && check("Assign_ceoname", null, "대표자성명을 등록해주세요.")) { } + + else if (isrebate && (check("Assign_post", null, "우편번호를 등록해주세요.") || check("Assign_address1", null, "주소를 등록해주세요.") || check("Assign_address2", null, "상세주소를 등록해주세요."))) { } + else if (isrebate && check("Assign_btype", null, "업태를 등록해주세요.")) { } + else if (isrebate && check("Assign_bkind", null, "종목을 등록해주세요.")) { } + else if (isrebate && (check("Assign_taxemail1", null, "계산서받을 이메일을 등록해주세요.") || check("Assign_taxemail2", null, "계산서받을 이메일을 등록해주세요."))) { } + else if (isrebate && !isemail(assign_taxemail)) { focus("Assign_taxemail1"); msg("올바른 이메일주소를 입력해주세요."); } + else if (check("User_userpno1", null, "주민등록번호 앞자리를 입력하십시오.") || check("User_userpno2", null, "주민등록번호 뒷자리를 입력하십시오.")) { } else if (check("User_mobile1", null, "휴대전화를 등록해주세요.") || check("User_mobile2", null, "휴대전화를 등록해주세요.") || check("User_mobile3", null, "휴대전화를 등록해주세요.")) { } else if (!ismobilenumber(user_mobile)) { focus("mobile"); msg("휴대전화를 확인해주세요."); } diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 0f52469..1127dab 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -12,7 +12,7 @@ @*직무분야*@ @*pplno*@ @*교육일정선택(selMonth)*@ - @*업체/개인 선택*@ + @*업체/개인 선택*@
@Html.HiddenFor(m => m.payno)
종목 @Html.TextBoxFor(x => x.Assign.bkind, new { @class = "apylpt", @maxlength = "50" })
고용보험관리번호@Html.TextBoxFor(x => x.Assign.eino, new { @class = "apylpt", @maxlength = "30" })
담당자성명 @Html.TextBoxFor(x => x.Assign.mname, new { @class = "apylpt", @maxlength = "30" })