From 2b2d385ea61e0b377257a4f349fd7b9f807cdef3 Mon Sep 17 00:00:00 2001 From: ndbs Date: Sat, 5 Mar 2022 10:58:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E5=88=86=E9=85=8D=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasicChange/Form.cshtml | 13 +++-- .../Views/StuInfoBasicChange/Form.js | 47 ++++++++++++++++--- .../Views/Accommodation/FormRoom.js | 2 + 3 files changed, 52 insertions(+), 10 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 14626a53b..2b49fb372 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 @@ -26,7 +26,7 @@
-
学籍原安排
+
学籍异动前信息
系部*
@@ -39,8 +39,7 @@
班级*
- -
学籍新安排
+
学籍异动后信息
- +
转出学校
+
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js index 7ab5cc570..c8a74c3e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js +++ b/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') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".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') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".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(''); } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js index adaf82b2a..edc8a2238 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/FormRoom.js +++ b/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 = '';