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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js

@@ -47,6 +47,10 @@ var bootstrap = function ($, learun) {
                             $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
                             $(".NewSchool").find('.OutSchool').attr("checkexpession");
                             $(".NewSchool").find('.OutSchool').attr('readonly');
+                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
+                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
+                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
+                            $(".NewContainer").hide();
                         } else if (item.id === "03") { //复学
                             $(".NewSchool").hide();
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -180,7 +184,10 @@ var bootstrap = function ($, learun) {
                                 $(".NewSchool").find('.OutSchool').attr("isvalid");
                                 $(".NewSchool").find('.OutSchool').attr("checkexpession");
                                 $(".NewSchool").find('.OutSchool').attr('readonly');
-                                $('#OutSchool').val('');
+                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
+                                $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
+                                $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
+                                $(".NewContainer").hide();
                             } else if (data[id].StuChangeType == "03") { //转专业
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
                                 $(".NewSchool").hide();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js

@@ -45,6 +45,10 @@ var bootstrap = function ($, learun) {
                             $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
                             $(".NewSchool").find('.OutSchool').attr("checkexpession");
                             $(".NewSchool").find('.OutSchool').attr('readonly');
+                            $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
+                            $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
+                            $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
+                            $(".NewContainer").hide();
                         } else if (item.id === "03") { //复学
                             $(".NewSchool").hide();
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -179,6 +183,10 @@ var bootstrap = function ($, learun) {
                                 $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
                                 $(".NewSchool").find('.OutSchool').attr("checkexpession");
                                 $(".NewSchool").find('.OutSchool').attr('readonly');
+                                $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
+                                $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
+                                $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
+                                $(".NewSchool").hide();
                             } else if (item.id === "03") { //复学
                                 $(".NewSchool").hide();
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');