宿舍分配学生添加搜索功能

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

@@ -26,7 +26,7 @@
         <div id="StuChangeReason" isvalid="yes" checkexpession="NotNull"></div>
     </div>
 
-    <div class="col-xs-12 text-center">学籍原安排</div>
+    <div class="col-xs-12 text-center">学籍异动前信息</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
         <div id="DeptNo"  readonly="readonly"></div>
@@ -39,8 +39,7 @@
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
         <div id="ClassNo" readonly="readonly"></div>
     </div>
-
-    <div class="col-xs-12 text-center">学籍新安排</div>
+    <div class="col-xs-12 text-center">学籍异动后信息</div>
     <div class="NewContainer" style="display:none;">
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新系部">新系部</div>
@@ -55,7 +54,13 @@
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-
+    <div class="col-xs-12 text-center">转出学校</div>
+    <div class="NewSchool" style="display:none;">
+        <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
+            <div class="lr-form-item-title" data-title="转出学校">转出学校</div>
+            <input id="OutSchool" type="text" class="form-control" />
+        </div>
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">备注</div>
         <textarea id="StuChangeRemark" class="form-control" style="height:50px;"></textarea>

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

@@ -32,15 +32,33 @@ var bootstrap = function ($, learun) {
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
-                        if (item.id === "01" || item.id === "02") { //降级、转班
+                        $(".NewSchool").hide();
+                        if (item.id === "01" ) { //留级
+                            $(".NewSchool").hide();
                             $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                             $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
-                        }
-                        else if (item.id === "03") {    //转专业
+                            $('#OutSchool').val('');
+                        } else if (item.id === "02") {//转校
+                            $(".NewSchool").show();
+                            $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
+                            $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
+                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
+                            $(".NewSchool").find('.OutSchool').attr('readonly');
+                        } else if (item.id === "03") { //复学
+                            $(".NewSchool").hide();
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
+                            $('#OutSchool').val('');
+                        } else if (item.id === "04") { //转入
+                            $(".NewSchool").hide();
+                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
+                            $('#OutSchool').val('');
                         }
-                        else {    //退学、休学、转校
+                        else { //退学、休学、
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -48,6 +66,8 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
+                            $(".NewSchool").hide();
+                            $('#OutSchool').val('');
                         }
 
                     }
@@ -147,11 +167,24 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewContainer").show();
-                            if (data[id].StuChangeType == "01" || data[id].StuChangeType == "02") { //降级、转班
+                            if (data[id].StuChangeType == "01") { //降级、转班
                                 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
+                                $(".NewSchool").hide();
+                                $('#OutSchool').val('');
                             }
-                            else if (data[id].StuChangeType == "03") {    //转专业
+                            else if (data[id].StuChangeType == "02") {//转校
+                                $(".NewSchool").show();
+                                $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
+                                $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
+                                $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                                $(".NewSchool").find('.OutSchool').attr("isvalid");
+                                $(".NewSchool").find('.OutSchool').attr("checkexpession");
+                                $(".NewSchool").find('.OutSchool').attr('readonly');
+                                $('#OutSchool').val('');
+                            } else if (data[id].StuChangeType == "03") { //转专业
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                                $(".NewSchool").hide();
+                                $('#OutSchool').val('');
                             }
                             else {    //退学、休学、转校
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
@@ -161,6 +194,8 @@ var bootstrap = function ($, learun) {
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
+                                $(".NewSchool").hide();
+                                $('#OutSchool').val('');
                             }
                         }
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js

@@ -52,6 +52,8 @@ var bootstrap = function ($, learun) {
                             text: "stuname",
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
                             param: { code: "StuInfoBasic", strWhere: strWhere  },
+                            // 是否允许搜索
+                            allowSearch: true,
                             select: function (item) {
                                // console.log(item);
                                 var stuid = '';