diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml index f05b81ebe..96d682a47 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.cshtml @@ -89,6 +89,10 @@
是否录取
+
+
是否住校
+
+
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js index 70d989ab8..6db16c40d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollFormView.js @@ -24,6 +24,10 @@ var bootstrap = function ($, learun) { type: 'radio', code: 'YesOrNoBit', }); + $('#zusu').lrRadioCheckbox({ + type: 'radio', + code: 'YesOrNoBit', + }); $('#IdCardPto1').lrUploader({ isUpload: false }); $('#IdCardPto2').lrUploader({ isUpload: false }); $('#MidDiplomaPto').lrUploader({ isUpload: false }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js index b120e0f3f..6dfc57637 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/EnrollIndex.js @@ -270,6 +270,18 @@ var bootstrap = function ($, learun) { } } }, + { + label: "是否住校", name: "zusu", width: 100, align: "left", + formatter: function (value) { + if (value == true) { + return ""; + } else if (value == false) { + return ""; + } else { + return ""; + } + } + } ], //isMultiselect: true, mainId: 'StuId', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js index 9d7371526..b9e9f5b55 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollScore/AdmissionIndex.js @@ -178,6 +178,18 @@ var bootstrap = function ($, learun) { } } }, + { + label: "是否住校", name: "zusu", width: 100, align: "left", + formatter: function (value) { + if (value == true) { + return ""; + } else if (value == false) { + return ""; + } else { + return ""; + } + } + } ], //isMultiselect: true, mainId: 'StuId', diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs index 7af3b68bb..471e9f6dc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollEntity.cs @@ -259,6 +259,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("REMARK")] public string Remark { get; set; } + + [Column("ZUSU")] + public bool? zusu { get; set; } /// /// 班级 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 4de684654..793f095c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs @@ -98,7 +98,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.DeptNo, t.Grade, t.THROUGHPROJECT, - t.Status,t.StuMobile,t.Specialty,t.City,t.County,t.EmpNo,t.IsAdmission,t.EnrollStatus,t.MidTermExam + t.Status,t.StuMobile,t.Specialty,t.City,t.County,t.EmpNo,t.IsAdmission,t.EnrollStatus,t.MidTermExam,t.zusu "); strSql.Append(" FROM StuEnroll t "); strSql.Append(" WHERE 1=1 ");