Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ClassInfo/Index.js

@@ -270,6 +270,12 @@ var bootstrap = function ($, learun) {
                         formatter: function (cellvalue) {
                             return cellvalue == true ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
                         }
+                    },
+                    {
+                        label: "班级状态", name: "ClassStatus", width: 100, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "已毕业班级" : "未毕业班级";
+                        }
                     }
                 ],
                 mainId: 'ClassId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.cshtml

@@ -20,7 +20,8 @@
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">年级</div>
-                                    <div id="Grade"></div>
+                                    @*<div id="Grade"></div>*@
+                                    <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/Index.js

@@ -39,7 +39,8 @@ var bootstrap = function ($, learun) {
                 text: "majorname",
                 param: { strWhere: "1=1 AND CheckMark=1" },
                 select: function (item) {
-                    var Grades = $("#Grade").lrselectGet();
+                    //var Grades = $("#Grade").lrselectGet();
+                    var Grades = $("#Grade").val();
                     if (Grades != null && Grades != "" && Grades != "undefined") {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
@@ -71,46 +72,83 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#Grade').lrselect({
-                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
-                value: "value",
-                text: "text",
-                select: function (item) {
-                    var MajorNos = $("#MajorNo").lrselectGet();
-                    if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
-                        if (item) {
-                            $('#ClassNo').lrselectRefresh({
-                                allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
-                                param: {
-                                    strWhere: "majorno='" + MajorNos + "' AND Grade='" + item.text + "' order by classno desc"
-                                }
-                            });
-                        } else {
-                            $('#ClassNo').lrselectRefresh({
-                                allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
-                                param: { strWhere: "1=1 order by classno desc" }
-                            });
-                        }
+            //$('#Grade').lrselect({
+            //    url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+            //    value: "value",
+            //    text: "text",
+            //    select: function (item) {
+            //        var MajorNos = $("#MajorNo").lrselectGet();
+            //        if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+            //            if (item) {
+            //                $('#ClassNo').lrselectRefresh({
+            //                    allowSearch: true,
+            //                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+            //                    param: {
+            //                        strWhere: "majorno='" + MajorNos + "' AND Grade='" + item.text + "' order by classno desc"
+            //                    }
+            //                });
+            //            } else {
+            //                $('#ClassNo').lrselectRefresh({
+            //                    allowSearch: true,
+            //                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+            //                    param: { strWhere: "1=1 order by classno desc" }
+            //                });
+            //            }
+            //        } else {
+            //            if (item) {
+            //                $('#ClassNo').lrselectRefresh({
+            //                    allowSearch: true,
+            //                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+            //                    param: {
+            //                        strWhere: "1=1 AND Grade='" + item.text + "' order by classno desc"
+            //                    }
+            //                });
+            //            } else {
+            //                $('#ClassNo').lrselectRefresh({
+            //                    allowSearch: true,
+            //                    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+            //                    param: { strWhere: "1=1 order by classno desc" }
+            //                });
+            //            }
+            //        }
+
+            //    }
+            //});
+            $('#Grade').on('input', function () {
+                var val = $(this).val();
+                var MajorNos = $("#MajorNo").lrselectGet();
+                if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
+                    if (val) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                            param: {
+                                strWhere: "majorno='" + MajorNos + "' AND Grade='" + val + "' order by classno desc"
+                            }
+                        });
                     } else {
-                        if (item) {
-                            $('#ClassNo').lrselectRefresh({
-                                allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
-                                param: {
-                                    strWhere: "1=1 AND Grade='" + item.text + "' order by classno desc"
-                                }
-                            });
-                        } else {
-                            $('#ClassNo').lrselectRefresh({
-                                allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
-                                param: { strWhere: "1=1 order by classno desc" }
-                            });
-                        }
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                            param: { strWhere: "1=1 order by classno desc" }
+                        });
+                    }
+                } else {
+                    if (val) {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                            param: {
+                                strWhere: "1=1 AND Grade='" + val + "' order by classno desc"
+                            }
+                        });
+                    } else {
+                        $('#ClassNo').lrselectRefresh({
+                            allowSearch: true,
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                            param: { strWhere: "1=1 order by classno desc" }
+                        });
                     }
-
                 }
             });
             $('#ClassNo').lrselect({

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/printxjk.cshtml

@@ -129,7 +129,7 @@
                 <td>家庭住址</td>
                 <td colspan="3">@Model.MailAddress</td>
                 <td>毕业时间</td>
-                <td colspan="2">@(Model.FinishSchoolDate.HasValue ? Model.EntranceDate.Value.ToShortDateString().Replace("/", "-") : "")</td>
+                <td colspan="2">@(Model.FinishSchoolDate.HasValue ? Model.FinishSchoolDate.Value.ToShortDateString().Replace("/", "-") : "")</td>
             </tr>
             <tr>
                 <td>异动情况</td>