BO/Controllers/croomController.cs

@@ -270,9 +270,13 @@ namespace NP.BO.Controllers
 
                 default: break;
             }
+            ht.Remove("searchtext");
+            ht.Add("searchtext", vm.addstringval5);
             vm.Lects = Dao.Get<Lect>("lect.lects", ht);
             vm.pagetotalcount = GetCount(vm.Lects.FirstOrDefault());
 
+            vm.ComCodes = GetComCodes("typeman,typeedu,typegrade,typejob");
+
             return View(vm);
         }
         public ActionResult cmlectattprint(VMCM vm)

BO/Views/Shared/Partial/ScriptPost.cshtml

@@ -1,4 +1,5 @@
-<script type="text/javascript" src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>
+@*<script type="text/javascript" src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script>*@
+<script type="text/javascript" src="https://ssl.daumcdn.net/dmaps/map_js_init/postcode.v2.js"></script>
 <script type="text/javascript">
     //daum 신주소 오픈api
 

BO/Views/croom/asrpop.cshtml

@@ -92,6 +92,9 @@
 <div style="text-align:center" id="btnsaveasr">
     <a href="#" class="btn btn-primary" onclick="save();">저장</a>
 </div>
+<div id="postlayer" class="daumpost">
+    <a href="#" class="btn btn-xxs btn-select closedaumpost" onclick="closeDaumPostcode();">close</a>
+</div>
 
 @section scriptsHeader{
     @Html.Partial("./Partial/ScriptPost")

BO/Views/croom/cmlects.cshtml

@@ -240,13 +240,13 @@
     <script>
     var selectedLectno;
     var selectedCmisno;
-        $(document).ready(function () {
+    $(document).ready(function () {
-            $("#addstringval5").on("keydown", function (e) {
+        $("#addstringval5").on("keydown", function (e) {
-                if (e.keyCode == 13) {
+            if (e.keyCode == 13) {
-                    submit();
+                submit();
-                }
+            }
-            });
+        });
-            setScd2();
+        setScd2();
     });
     function leave() {
         if ($("#tbody1 tr input.autocheck:checked").length < 1) {
@@ -314,7 +314,6 @@
             $("#selTypejob").val(ds[14]).attr("selected", "selected");
             $("#selTypeedu").val(ds[15]).attr("selected", "selected");
             $("#selTypegrade").val(ds[16]).attr("selected", "selected");
-            $("#txtpplno").val(ds[17]);
             $("#hidpplno").val(ds[17]);
         }
     }
@@ -499,7 +498,7 @@
 
     function viewas(asno) {
         winopen("/croom/asrpop?intval=" + asno, 'asrpop', 1200, screen.height - 500);
-        }
+    }
 
     function savetype() {
         if (confirm("교육신청 정보를 저장하시겠습니까??")) {

BO/Views/croom/cmstandbylects.cshtml

@@ -38,7 +38,8 @@
         <div style="padding: 5px 20px; background-color: #fff;">
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-승인상태;3:대기중;4:수강승인;5:수강취소" }, { "name", "addstringval" }, { "selected", Model.addstringval }, { "onchange", "submit()" } })
             @Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-결제상태;0:결제대기;1:입금대기;2:완료;3:취소;4:환불신청;5:부분환불;6:전액환불" }, { "name", "addstringval2" }, { "selected", Model.addstringval2 }, { "onchange", "submit()" } })
-            &nbsp;&nbsp;
+            @Html.Partial("./Partial/Text", Model.addstringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "addstringval5", Value = Model.addstringval5, PH = "ID 또는 이름을 입력하세요.", CssClass = "", Style = "width:250px; display:inline-block;" }))
+            <a href="#" class="btn btn-default" onclick="submit()" id="btnsearchtext2">검색</a>
             <a href="#" class="btn btn-default" onclick="golist()">목록</a>
             <a href="#" class="btn btn-danger" style="float:right;" onclick="save2(5)">선택취소</a>
             <a href="#" class="btn btn-success" style="float:right; margin-right:10px;" onclick="save2(4)">선택승인</a>
@@ -51,35 +52,44 @@
                     <tr>
                         <th><input type="checkbox" onclick="javascript: checkall('excel1', this);" /></th>
                         <th width="40">No</th>
-                        <th>소속</th>
+                        <th>고객사</th>
                         <th>신청자(ID)</th>
                         <th>교육생</th>
                         <th>신청일</th>
                         <th>승인상태</th>
                         <th>결제상태</th>
+                        <th>환급</th>
                     </tr>
                 </thead>
                 <tbody class="data" id="tbody1">
                     @foreach (var d in Model.Lects)
                     {
-                        <tr>
+                    <tr>
-                            <td>
+                        <td>
-                                @if (d.pstatus == 21 || d.pstatus == 55 || d.pstatus == 52)
+                            @if (d.pstatus == 21 || d.pstatus == 55 || d.pstatus == 52)
-                                {
+                            {
-                                    <input type="checkbox" class="autocheck" value="@d.lectno" data-lectno="@d.lectno" data-emailinfo="@(d.username):@(d.email)" />
+                                <input type="checkbox" class="autocheck" value="@d.lectno" data-lectno="@d.lectno" data-emailinfo="@(d.username):@(d.email)" />
-                                }
+                            }
-                            </td>
+                        </td>
-                            <td>@d.rnorvt</td>
+                        <td>@d.rnorvt</td>
-                            <td>@(d.asname)</td>
+                        <td class="link text-center"><a href="#" onclick="viewas(@d.asno);">@d.asname</a></td>
-                            <td>@(d.cnoname)(@d.cnoid)</td>
+                        <td>@(d.cnoname)(@d.cnoid)</td>
-                            <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}",d.asname,d.username, d.userid??"",d.uduty, d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus)')">@d.username</a></td>
+                        <td class="link text-center"><a href="#" onclick="viewlect(this, @d.ustatus, @d.lectno, @d.fileno, '@d.fileurl', '@d.orgname', @d.status, @d.pstatus,'@string.Format("{0}:{1}:{2}:{3}:{4}:{5}:{6}:{7}:{8}:{9}:{10}:{11}:{12}:{13}:{14}:{15}",d.asname,d.username, d.userid??"",d.uduty, d.depart??"", d.email, d.telno, d.mobile,d.ckfcfyear,d.assignuser,d.edus,d.typeman,d.typejob,d.typeedu,d.typegrade,d.pplno)')">@d.username</a></td>
-                            <td>@d.cdtymd</td>
+                        <td>@d.cdtymd</td>
-                            <td>
+                        <td>
-                                @(d.pstatusname3)<br />
+                            @(d.pstatusname3)<br />
-                                @(d.pstatusname3 != "대기중" ? "(" + d.oktime.ToString("yyyy-MM-dd HH:mm") + ")" : string.Empty)
+                            @(d.pstatusname3 != "대기중" ? "(" + d.oktime.ToString("yyyy-MM-dd HH:mm") + ")" : string.Empty)
-                            </td>
+                        </td>
-                            <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
+                        <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
-                        </tr>
+                        @if (d.cshape == 1 && d.isrebate == 1)
+                        {
+                            <td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, 0, @d.payuserno)">@d.isrebatename</a></td>
+                        }
+                        else
+                        {
+                            <td>-</td>
+                        }
+                    </tr>
                     }
                 </tbody>
             </table>
@@ -101,10 +111,59 @@
         <tr><th>이메일</th><td id="email"></td></tr>
         <tr><th>휴대전화번호</th><td id="mobile"></td></tr>
         <tr class="trhidebox"><th>대기여부</th><td>@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "3:신청중;4:승인;5:미승인" }, { "checked", 3 }, { "name", "status" } })</td></tr>
+
+        <tr>
+            <th>기술인분류</th>
+            <td>
+                <select class="form-control dev" id="selTypeman" name="selTypeman">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeman"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>직무분야</th>
+            <td>
+                <select class="form-control dev" id="selTypejob" name="selTypejob">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typejob"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>교육목적</th>
+            <td>
+                <select class="form-control dev" id="selTypeedu" name="selTypeedu">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typeedu"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>등급</th>
+            <td>
+                <select class="form-control dev" id="selTypegrade" name="selTypegrade">
+                    @foreach (var t in Model.ComCodes.Where(w => w.cgroup.ToString() == "typegrade"))
+                    {
+                        <option value="@t.ccode">@t.cname</option>
+                    }
+                </select>
+            </td>
+        </tr>
     </table>
     <div class="findboxbtnbox" id="btnsavelect">
         <a href="#" class="btn btn-primary" onclick="save();">대기여부 저장</a>
     </div>
+    <div class="findboxbtnbox" id="btnsavetype">
+        <a href="#" class="btn btn-primary" onclick="savetype();">교육신청정보 저장</a>
+    </div>
+    <input type="hidden" id="hidpplno" />
     <br /><br />
 </div>
 @section scriptsHeader{
@@ -112,6 +171,13 @@
 }
 @section scripts{
     <script>
+        $(document).ready(function () {
+            $("#addstringval5").on("keydown", function (e) {
+                if (e.keyCode == 13) {
+                    submit();
+                }
+            });
+        });
         var _lectno;
         var _pstatus;
         function viewlect(a, ustatus, lectno, fileno, fileurl, orgname, status, pstatus, datas) {
@@ -133,6 +199,12 @@
                         $("#btnsavelect").attr("style", "display:none;");
                     }
                 }
+
+                $("#selTypeman").val(ds[11]).attr("selected", "selected");
+                $("#selTypejob").val(ds[12]).attr("selected", "selected");
+                $("#selTypeedu").val(ds[13]).attr("selected", "selected");
+                $("#selTypegrade").val(ds[14]).attr("selected", "selected");
+                $("#hidpplno").val(ds[15]);
             }
         }
         function save() {
@@ -182,5 +254,31 @@
                 submit("mform", 500, true);
             } else { msgadmin2(); }
         }
+
+        function viewas(asno) {
+            winopen("/croom/asrpop?intval=" + asno, 'asrpop', 1200, screen.height - 500);
+        }
+
+        function savetype() {
+            if (confirm("교육신청 정보를 저장하시겠습니까??")) {
+                capp("/acommon/pplogtypechange", {
+                    pplno: $("#hidpplno").val(),
+                    typeman: $("#selTypeman").val(),
+                    typejob: $("#selTypejob").val(),
+                    typeedu: $("#selTypeedu").val(),
+                    typegrade: $("#selTypegrade").val()
+                }, "afterUpdateType");
+            }
+        }
+        function afterUpdateType() {
+            if (capResult.code > 0) {
+                msgok(1, "", true);
+                submit("mform", 800, true);
+            }
+            else {
+                msg("관리자에게 문의하세요.");
+                return;
+            }
+        }
     </script>
 }