From 10018a084393922eccee3e1df1d42cd915894d8a Mon Sep 17 00:00:00 2001
From: lch <lch  @example.com>
Date: Fri, 30 Apr 2021 08:28:30 +0000
Subject: [PATCH] =?UTF-8?q?1.=20=ED=9C=B4=EB=8C=80=ED=8F=B0=20=EC=9D=B8?=
 =?UTF-8?q?=EC=A6=9D=20=EC=82=AD=EC=A0=9C=20(=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=EB=8F=84=20=ED=9C=B4=EB=8C=80?=
 =?UTF-8?q?=ED=8F=B0=20=EC=9D=B8=EC=A6=9D=20=EC=82=AD=EC=A0=9C)=202.=20?=
 =?UTF-8?q?=EC=B1=84=EC=9A=A9=ED=98=95=ED=83=9C(=EC=A0=95=EA=B7=9C?=
 =?UTF-8?q?=EC=A7=81,=20=EB=B9=84=EC=A0=95=EA=B7=9C=EC=A7=81),=20=EC=A7=81?=
 =?UTF-8?q?=EC=9C=84=20=EC=82=AD=EC=A0=9C=203.=20=EC=86=8C=EC=86=8D?=
 =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=B6=94=EA=B0=80=20-=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9D=B8/=EC=97=85=EC=B2=B4=20=20=20=20=EC=A7=81=EC=9E=A5=20?=
 =?UTF-8?q?=EC=9C=84=EC=97=90=20=EC=B6=94=EA=B0=80=204.=20=EC=86=8C?=
 =?UTF-8?q?=EC=86=8D=EC=97=AC=EB=B6=80=20'=EC=97=85=EC=B2=B4'=20=EC=84=A0?=
 =?UTF-8?q?=ED=83=9D=20=EC=8B=9C=20=EC=A7=81=EC=9E=A5=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=20=ED=99=9C=EC=84=B1=ED=99=94=20('=EA=B0=9C=EC=9D=B8'=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=EB=B9=84=ED=99=9C=EC=84=B1?=
 =?UTF-8?q?=ED=99=94)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BO/Views/user/ur.cshtml        |  2 +-
 FO/Views/Account/Join.cshtml   | 47 +++++++++++++++++++++-------------
 FO/Views/My/Index.cshtml       |  9 ++++---
 FO/Views/My/MyInfoCheck.cshtml | 43 +++++++++++++++++++------------
 4 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/BO/Views/user/ur.cshtml b/BO/Views/user/ur.cshtml
index 8534d67..068275f 100644
--- a/BO/Views/user/ur.cshtml
+++ b/BO/Views/user/ur.cshtml
@@ -465,7 +465,7 @@
             else if (('@Model.viewname' == 'professor' || '@Model.viewname' == 'user') && check("User_mobile", null, "핸드폰 번호를 입력해주세요")) { }
             else if (!isnulloremt(val("User_email")) && !isemail(val("User_email"))) { focus("User_email"); msg("이메일주소를 올바르게 입력해주세요."); }
             //else if (!isnulloremt(val("User_mobile")) && (!ismobile(val("User_mobile")) )) { focus("User_mobile"); msg("핸드폰번호를 올바르게 입력해주세요."); }
-            else if ((val("User_usertype") == "1" || val("User_usertype") == "81") && val("User_asno") == "") { msg("소속을 등록해주세요.");}
+            //else if ((val("User_usertype") == "1" || val("User_usertype") == "81") && val("User_asno") == "") { msg("소속을 등록해주세요.");}
             else if (confirm("저장하시겠습니까?")) {
                 if (val("User_usertype") >= "92") {
                     setv("User_asno", "");
diff --git a/FO/Views/Account/Join.cshtml b/FO/Views/Account/Join.cshtml
index 0a46952..9211b62 100644
--- a/FO/Views/Account/Join.cshtml
+++ b/FO/Views/Account/Join.cshtml
@@ -81,11 +81,9 @@ else
                         <li>-</li>
                         <li><input type="tel" id="userpno2" maxlength="7" class="int nocomma" placeholder="주민등록번호 뒤 7자리"></li>
                     </ul>
-                </li>
-                @*인증완료상태여도 재인증 가능*@
-                <li class="joinId">
-                    <input type="text" id="mobile" class="int nocomma" name="mobile" maxlength="13" placeholder="휴대전화번호" value="@(Model.User.mobile)" readonly="" style="background-color:#ddd;" )>
-                    <a href="#" onclick="mobchk();">인증</a>
+                </li>                
+                <li>
+                    <input type="text" id="mobile" class="int nocomma" name="mobile" maxlength="13" placeholder="휴대전화번호" value="@(Model.User.mobile)"  @(string.IsNullOrEmpty(Model.User.mobile) ? "" : "readonly style=\"background-color:#ddd;\"" ) > 
                 </li>
                 <li>
                     <ul class="jnAddr postbox">
@@ -97,18 +95,17 @@ else
                         <li><input type="text" name="address2" id="address2" class="postadrsub" placeholder="나머지 주소 입력"></li>
                     </ul>
                 </li>
+                <li>
+                    <ul class="jnType">
+                        <li><input type="radio" name="isCompany" value="0" id="isCompany0" checked><label for="isCompany0">개인</label></li>
+                        <li><input type="radio" name="isCompany" value="1" id="isCompany1"><label for="isCompany1">업체</label></li>
+                    </ul>
+                </li>
                 <li class="joinCpny">
                     <input type="hidden" id="asno" name="asno" />
                     <input type="text" id="asname" placeholder="직장" readonly="readonly" disabled style="background-color: #ddd;" />
-                    <a href="#" onclick="boxassignview()">검색</a>
-                </li>
-                <li>
-                    <ul class="jnType">
-                        <li><input type="radio" name="isassignuser" value="1" id="userType1"><label for="userType1">정규직</label></li>
-                        <li><input type="radio" name="isassignuser" value="0" id="userType0"><label for="userType0">비정규직</label></li>
-                    </ul>
-                </li>
-                <li><input type="text" name="uduty" id="uduty" placeholder="직위"></li>
+                    <a href="#" id="btnassign" style="background-color: #ddd;">검색</a>
+                </li> 
                 <li>
                     <ul class="jnType">
                         <li><input type="radio" name="slevel" value="1" id="lv1"><label for="lv1">고졸</label></li>
@@ -122,7 +119,8 @@ else
             <div class="joinAgree">
                 <input type="checkbox" id="agree">
                 <label for="agree"><a href="#" onclick="viewlayer(@(mainagree.pno), this, '이용약관');">이용약관,</a> <a href="#" onclick="viewlayer(@(mainprivate.pno), this, '개인정보처리방침');">개인정보 처리방침</a>에 동의합니다.</label>
-            </div>
+                <label>개인정보처리방침 상세 내용은 화면 하단에 위치하고 있습니다.</label>
+            </div>           
             <a href="#" class="joinBtn" onclick="save()">동의 후 가입</a>
         </div>
         @Html.Partial("./Partial/BoxAssign", null, new ViewDataDictionary { { "bindmethod", "bindassign" }, { "isjoin", 1 } })
@@ -143,6 +141,21 @@ else
             $("#pageTitle h3").text("회원가입 완료");
         }
         snsLogin();
+
+        $("input:radio[name='isCompany']").on("click", function () {
+            var isCompany = $(this).val();
+            if (isCompany == "0") {
+                setv("asno", "");
+                setv("asname", "");
+                $("#btnassign").off("click");
+                $("#btnassign").css("background-color", "#ddd");
+            } else {
+                $("#btnassign").on("click", function () {
+                    boxassignview();
+                });
+                $("#btnassign").css("background-color", "#666");
+            }
+        });
     });
     function save() {
         setv("userid", val("userid").replace(/ /, '').replace(/	/, ''));
@@ -167,9 +180,7 @@ else
         else if (getBytes(val("userpno1")) != 6 || getBytes(val("userpno2")) != 7) { focus("userpno2"); msg("주민등록번호를 확인해주세요"); }
         else if (!ismobilenumber(val("mobile"))) {focus("mobile");msg("핸드폰번호를 확인해주세요.");}
         else if (check("post", null, "우편번호를 등록해주세요.") || check("address1", null, "우편번호를 등록해주세요.") || check("address2", null, "우편번호를 등록해주세요.")) { }
-        else if (check("asno", null, "직장을 등록해주세요.")) { }
-        else if ($("input:radio[name='isassignuser']:checked").val() == null) { msg("채용형태를 선택해주세요"); }
-        else if (check("uduty", null, "직위를 입력해주세요.")) { }
+        else if ($("input:radio[name='isCompany']:checked").val() == "1" && check("asno", null, "직장을 등록해주세요.")) { }        
         else if ($("input:radio[name='slevel']:checked").val() == null) { msg("학력을 선택해주세요"); }
         else if (!$("#agree").prop("checked")) { $("#agree").focus(); msg("이용약관/개인정보처리방침에 동의해주세요."); }
         else {
diff --git a/FO/Views/My/Index.cshtml b/FO/Views/My/Index.cshtml
index d6ecc80..1177829 100644
--- a/FO/Views/My/Index.cshtml
+++ b/FO/Views/My/Index.cshtml
@@ -30,14 +30,17 @@
 }
 <div class="mpgCont">
     <div class="mpgDsc">
+        @if (Model.Assign != null)
+        {
         <ul>
             <li><b>회사명 : </b>@Model.Assign.asname</li>
-            <li><b>연락처(이메일) : </b>@(Model.Assign.mphone) @(Model.Assign.taxemail == null ? "" : "("+Model.Assign.taxemail+")")</li>
+            <li><b>연락처(이메일) : </b>@(Model.Assign.mphone) @(Model.Assign.taxemail == null ? "" : "(" + Model.Assign.taxemail + ")")</li>
         </ul>
-        @if(Model.Assign.status == 1)
+        }
+        @if(Model.Assign != null && Model.Assign.status == 1)
         {
             <p>※ 정보가 변경되었을 경우 정보 수정페이지로 이동하여 정확한 정보를 변경하여 주시기 바랍니다 <a href="/My/MyAssInfo">정보수정</a></p>
-        }
+        } 
     </div>
     <div class="mpgClass">
         <div class="mpgcCont">
diff --git a/FO/Views/My/MyInfoCheck.cshtml b/FO/Views/My/MyInfoCheck.cshtml
index 194e829..f381624 100644
--- a/FO/Views/My/MyInfoCheck.cshtml
+++ b/FO/Views/My/MyInfoCheck.cshtml
@@ -88,29 +88,25 @@
                     </div>
                 </td>
             </tr>
+            <tr>
+                <th>소속</th>
+                <td>
+                    <ul class="sctyRadio"> 
+                        <li><input type="radio" name="isCompany" value="0" id="isCompany0" @(u.asno == null  ? "checked" : "")><label for="isCompany0">개인</label></li>
+                        <li><input type="radio" name="isCompany" value="1" id="isCompany1" @(u.asno == null  ? "" : "checked")><label for="isCompany1">업체</label></li>
+                    </ul>
+                </td>
+            </tr>
             <tr>
                 <th>직장</th>
                 <td>
                     <div class="mdfyBirth">
                         <input type="hidden" id="asno" name="asno" value="@u.asno" />
                         <p id="asname">@(u.asname ?? "-")</p>
-                        <a id="btnassign" href="#" onclick="boxassignview()">수정</a>
+                        <a href="#" id="btnassign" style="background-color:@(u.asno == null  ? "#ddd;" : "#fff;")">수정</a>
                     </div>
                 </td>
-            </tr>
-            <tr>
-                <th>채용형태</th>
-                <td>
-                    <ul class="sctyRadio">
-                        <li><input type="radio" name="isassignuser" id="isassignuser1" value="1" @(u.isassignuser == 1 ? "checked" : "")><label for="isassignuser1">정규직</label></li>
-                        <li><input type="radio" name="isassignuser" id="isassignuser0" value="0" @(u.isassignuser == 0 ? "checked" : "")><label for="isassignuser0">비정규직</label></li>
-                    </ul>
-                </td>
-            </tr>
-            <tr>
-                <th>직위</th>
-                <td><input type="text" id="uduty" name="uduty" class="min230" value="@(u.uduty)"></td>
-            </tr>
+            </tr>            
             <tr>
                 <th>학력</th>
                 <td>
@@ -212,6 +208,21 @@
                 selectTab("sns");
                 
             }
+
+            $("input:radio[name='isCompany']").on("click", function () {
+                var isCompany = $(this).val();
+                if (isCompany == "0") {
+                    setv("asno", "");
+                    $("#asname").text("-");
+                    $("#btnassign").off("click");
+                    $("#btnassign").css("background-color", "#ddd");
+                } else {
+                    $("#btnassign").on("click", function () {
+                        boxassignview();
+                    });
+                    $("#btnassign").css("background-color", "#fff");
+                }
+            });
         });
         function setemail2() {
             setv("email2", val("email3"));
@@ -240,7 +251,7 @@
                 else if (check("mobile", null, "휴대전화번호를 입력해주세요.")) { }
                 else if (!ismobilenumber(val("mobile"))) { focus("mobile"); msg("휴대전화번호를 확인해주세요."); }
                 else if (!isemail(val("email"))) { focus("email1"); msg("올바른 이메일주소를 입력해주세요."); }
-                else if (check("asno", "btnassign", "직장을 선택해주세요.")) { }
+                else if ($("input:radio[name='isCompany']:checked").val() == "1" && check("asno", "btnassign", "직장을 선택해주세요.")) { }
                 else {
                     cap("/fcommon/usersave", "mform", "cbsave");
                 }