diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml index 7933f349a..2279f29e3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml @@ -64,7 +64,7 @@
异动类型*
-
+
注销账号*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js index acbc18c60..19b867e49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js @@ -124,8 +124,19 @@ var bootstrap = function ($, learun) { text: "classname" }); //提交下拉框 - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); - $('#AnomalousType').lrselectSet("05"); + //$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#AnomalousType').lrselect({ + url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3', + param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='05' or F_ItemValue='12'or F_ItemValue='11' or F_ItemValue='10' ) order by F_ItemValue desc" }, + value: "F_ItemValue", + text: "F_ItemName" + //nodeClick: function (item) { + // type = item.value; + // $('#titleinfo').text(item.text); + // page.search(); + //} + }); + //$('#AnomalousType').lrselectSet("05"); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); // 刷新 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs index 95c41d764..2c1714848 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs @@ -297,7 +297,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration entitylist.Add(InsertEntity); } } - else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05")//退学、转出 + else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05" || InsertEntity.AnomalousType == "10" || InsertEntity.AnomalousType == "11" || InsertEntity.AnomalousType == "12")//退学、死亡,失踪,开除,转出 { if (this.BaseRepository("CollegeMIS").FindEntity(x => x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate) == null) @@ -433,6 +433,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration case "02": //转校 case "05": //退学 case "06": //休学 + case "10": //开除 + case "11": //死亡 + case "12": //失踪 #region 复制一份学生学籍表 copyStuInfoBasic(upTrua, stulist, InsertStuTran); @@ -630,7 +633,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } - else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06") + else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12") { if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据? {