From ff18e6b0ea75fca6db6ff1701bb70c84d10410e3 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Fri, 18 Mar 2022 10:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D=E5=BC=82?=
 =?UTF-8?q?=E5=8A=A8=E8=BD=AC=E5=87=BA=E5=AD=A6=E6=A0=A1=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasicChange/Form.cshtml      |  2 +-
 .../Views/StuInfoBasicChange/FormView.cshtml  |  2 +-
 .../Views/StuInfoBasicChange/FormView.js      | 35 +++++++++++++++----
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml
index 2b49fb372..d0b4c7d6e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml	
@@ -54,7 +54,7 @@
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-    <div class="col-xs-12 text-center">转出学校</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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml
index fec9d53d1..6b0d434b8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.cshtml	
@@ -52,7 +52,7 @@
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-    <div class="col-xs-12 text-center">转出学校</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>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js
index f32ec1e2a..ad41a4f25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/FormView.js	
@@ -165,20 +165,41 @@ 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") { //降级、转班
-                                //$(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                            }
-                            else if (data[id].StuChangeType == "03") {    //转专业
-                                //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                            if (item.id === "01") { //留级
+                                $(".NewSchool").hide();
+                                $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
+                                $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
+                                $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                                $('#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 if (data[id].StuChangeType == "04" || data[id].StuChangeType == "05") {    //退学、休学
+                            else { //退学、休学、
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
-                                //$(".NewContainer").find('.contentDiv').removeAttr('readonly');
+                                $(".NewContainer").find('.contentDiv').removeAttr('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();
+                                $(".NewSchool").hide();
+                                $('#OutSchool').val('');
                             }
                         }
                     }