diff --git a/Base/Controller/FCommon.cs b/Base/Controller/FCommon.cs index 96ac76d..d2cfafd 100644 --- a/Base/Controller/FCommon.cs +++ b/Base/Controller/FCommon.cs @@ -297,27 +297,10 @@ namespace NP.Base.Controllers } else if (isCompany == 1) //업체 { - //강의유형 온라인 or 혼합(온+오프) - if (ppllog.cshape == 0 || ppllog.cshape == 2) + //업체인데 회사정보가 안넘어오면 에러처리 + if (vm.Assign == null) { - ppllog.asno = vm.asno; - vm.Assign = Dao.Get("cm.assign.applyedu.byasno", new Hashtable() { { "asno", vm.asno } }).FirstOrDefault(); - if (vm.Assign != null) - { - if (!string.IsNullOrEmpty(vm.Assign.MphoneFormat) && vm.Assign.MphoneFormat.IndexOf("-") >= 0) - { - string[] mphoneArr = vm.Assign.MphoneFormat.Split('-'); - vm.Assign.mphone1 = mphoneArr.Length > 0 ? mphoneArr[0] : string.Empty; - vm.Assign.mphone2 = mphoneArr.Length > 1 ? mphoneArr[1] : string.Empty; - vm.Assign.mphone3 = mphoneArr.Length > 2 ? mphoneArr[2] : string.Empty; - } - if (!string.IsNullOrEmpty(vm.Assign.taxemail) && vm.Assign.taxemail.IndexOf("@") >= 0) - { - string[] taxemailArr = vm.Assign.taxemail.Split('@'); - vm.Assign.taxemail1 = taxemailArr.Length > 0 ? taxemailArr[0] : string.Empty; - vm.Assign.taxemail2 = taxemailArr.Length > 1 ? taxemailArr[1] : string.Empty; - } - } + return JsonNoData(); } } #endregion diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index 5a447fc..d251f8e 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -135,10 +135,10 @@ 업체/개인 선택 - - -    - + @@ -183,7 +183,7 @@ *회사명 - @Html.TextBoxFor(x => x.Assign.asname, new { @class = "apylpt", @maxlength = "100" }) + @Html.TextBoxFor(x => x.Assign.asname, new { @class = "apylpt", @maxlength = "100", @style = "background-color:#ddd;", @readonly = true }) 검색 @@ -443,18 +443,10 @@ }); $("input:radio[name='isCompany']").on("click", function () { - if ($(this).val() == "0") { - $("#asno").val(""); - $("#asname").val(""); + if ($(this).val() == "0") { $(".div-companyInfo").hide(); } else { - if (model.cm.cshape == 1) { - $(".div-companyInfo").show(); - } else { - if (model.isloaded) { - boxassignview(); - } - } + $(".div-companyInfo").show(); } }); @@ -464,7 +456,7 @@ }); $("#btnassign").on("click", function () { - boxassignview(bindassign2); + boxassignview(bindassign); }); initControl(); @@ -481,17 +473,13 @@ } }, 300); - if (model.cm.cshape == 0) { - $(".div-companyInfo").hide(); + if (model.cm.cshape == 0) { $(".div-isCompany").show(); $(".uduty").hide(); } else if (model.cm.cshape == 1) { - $(".div-companyInfo").show(); $(".div-isCompany").hide(); - $(".uduty").show(); - $("#asname").hide(); + $(".uduty").show();; } else if (model.cm.cshape == 2) { - $(".div-companyInfo").hide(); $(".div-isCompany").show(); $(".uduty").hide(); } @@ -513,26 +501,20 @@ } if (model.assign.asno == 0) { - $("#btnassign").show(); - $("#Assign_asname").prop("readonly", true); - $("#Assign_asname").css("background-color", "#ddd"); + $("#btnassign").show(); + $(".div-companyInfo").hide(); } else { - $("#btnassign").hide(); - $("#Assign_asname").prop("readonly", false); - $("#Assign_asname").css("background-color", "#fff"); + $("#btnassign").hide(); + $(".div-companyInfo").show(); } - } + } function bindassign(v) { - $("#asno").val(v.split(':')[0]); - $("#asname").val(v.split(':')[1]); - } - function bindassign2(v) { $("#Assign_asno").val(v.split(':')[0]); $("#Assign_asname").val(v.split(':')[1]); - capp("/fcommon/getassign", { asno: $("#Assign_asno").val() }, "cbbindassign2"); + capp("/fcommon/getassign", { asno: $("#Assign_asno").val() }, "cbbindassign"); } - function cbbindassign2() { + function cbbindassign() { if (capResult.code == 1000) { var mphone = String(capResult.obj.mphone).split("-"); var mphone1 = mphone.length > 0 ? mphone[0] : ""; @@ -618,7 +600,7 @@ if (isrebate) { isCompanyInfoCheck = true; } - else if (model.cm.cshape == 1 && isCompany) { + else if (isCompany) { isCompanyInfoCheck = true; } @@ -639,7 +621,6 @@ else if (isCompanyInfoCheck && !ismobilenumber(assign_mphone)) { focus("Assign_mphone1"); msg("담당자연락처를 확인해주세요."); } else if (isCompanyInfoCheck && (check("Assign_taxemail1", null, "계산서받을 이메일을 등록해주세요.") || check("Assign_taxemail2", null, "계산서받을 이메일을 등록해주세요."))) { } else if (isCompanyInfoCheck && !isemail(assign_taxemail)) { focus("Assign_taxemail1"); msg("올바른 이메일주소를 입력해주세요."); } - else if (!isrebate && (isCompany && model.cm.cshape != 1) && $("#asname").val() == "") { msg("업체를 선택해주세요.", null, null, null, "boxassignview()"); } 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/Shared/Partial/BoxAssign.cshtml b/FO/Views/Shared/Partial/BoxAssign.cshtml index 8423b39..2ede8f5 100644 --- a/FO/Views/Shared/Partial/BoxAssign.cshtml +++ b/FO/Views/Shared/Partial/BoxAssign.cshtml @@ -66,12 +66,7 @@ //$("#boxassigndata").hide(); boxassign_pagenum = 1; $("#boxassign").slideDown("fast"); - //if (!ismobile()) {$("#boxassign_brno").focus();} - if (callback != undefined) { - boxassign_callback = callback; - } else { - boxassign_callback = null; - } + boxassign_callback = callback; } function boxassignfind() { if (val("boxassign_brno") == "") { @@ -113,7 +108,7 @@ } function boxassignselectsingle(v) { boxassignclose(); - if (boxassign_callback != null) { + if (boxassign_callback) { boxassign_callback(v); } else { eval("@(_method)" + "('" + v + "')");