diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index bb578e616..9f0477867 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -91,6 +91,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 异动转入 + /// + /// + public ActionResult FormTran() + { + return View(); + } + /// /// 学生列表【班级信息管理】 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml new file mode 100644 index 000000000..8854572f9 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.cshtml @@ -0,0 +1,204 @@ +@{ + ViewBag.Title = "学生学籍"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
学校*
+
+
+
+
学号*
+ +
+
+
学籍号
+ +
+
+
考生号*
+ +
+
+
通知书号*
+ +
+
+
省编学号
+ +
+
+
身份证号*
+ +
+
+
姓名*
+ +
+
+
民族*
+
+
+
+
性别*
+
+
+
+
疫情状态
+
+
+
+
政治面貌
+
+
+
+
出生日期*
+ +
+
+
健康状况
+
+
+
+
户口分类
+
+
+
+
籍贯
+
+
+
+
+
+
+
+
照片
+
+
+
+
联系电话*
+ +
+
+
E-mail
+ +
+
+
通信地址*
+ +
+
+
邮政编码*
+ +
+
+
户口所在地
+ +
+
+
档案所在地
+ +
+
+
父亲姓名*
+ +
+
+
父亲电话*
+ +
+
+
母亲姓名*
+ +
+
+
母亲电话*
+ +
+
+
家庭出身
+
+
+
+
港澳台侨
+
+
+
+
年级*
+
+
+
+
本专科
+
+
+
+
学制
+
+
+
+
报到日期*
+ +
+
+
学习形式
+
+
+
+
毕业证号
+ +
+
+
毕业日期
+ +
+
+
系所*
+
+
+
+
专业*
+
+
+
+
班级*
+
+
+
+
入学年月*
+ +
+
+
入党时间
+ +
+
+
入团时间
+ +
+
+
校内地址
+ +
+
+
校内电话
+ +
+
+
QQ
+ +
+
+
特长
+ +
+
+
备注
+ +
+
+
毕业证书备注
+ + +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js new file mode 100644 index 000000000..c3a4fa33e --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormTran.js @@ -0,0 +1,205 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-02-21 16:53 + * 描 述：学生学籍 + */ +var acceptClick; +var keyValue = request('keyValue'); +var isStudent = request('isStudent'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + page.hide(); + }, + hide: function () { + if (isStudent == "1") { + $("#StuName").parent().hide(); + $("#IdentityCardNo").parent().hide(); + $("#StuNo").parent().hide(); + $("#ClassNo").parent().hide(); + $("#MajorNo").parent().hide(); + $("#EduSystem").parent().hide(); + $("#F_SchoolId").parent().hide(); + $("#StuCode").parent().hide(); + $("#ksh").parent().hide(); + $("#NoticeNo").parent().hide(); + $("#HealthStatusNo").parent().hide(); + $("#ResidenceNo").parent().hide(); + $("#F_ProvinceId").parent().parent().hide(); + $("#Photo").parent().hide(); + $("#DeptNo").parent().hide(); + $("#FamilyOriginNo").parent().hide(); + $("#OverseasChineseNo").parent().hide(); + $("#Grade").parent().hide(); + $("#GraduateNo").parent().hide(); + $("#EduSystem").parent().hide(); + $("#RegisterDate").parent().hide(); + $("#StudyModality").parent().hide(); + $("#GraduateYear").parent().hide(); + $("#EntranceDate").parent().hide(); + $("#JoinPartyDate").parent().hide(); + $("#JoinLeagueDate").parent().hide(); + $("#InSchoolAddress").parent().hide(); + $("#InSchoolTelephone").parent().hide(); + $("#Remark").parent().hide(); + $("#DiplomaRemark").parent().hide(); + $("#GoodAt").parent().hide(); + $("#InSchoolAddress").parent().hide(); + $("#InSchoolTelephone").parent().hide(); + $("#JoinLeagueDate").parent().hide(); + } + }, + bind: function () { + $('#F_ProvinceId').lrDataSourceSelect({ + code: 'DIC_PROVINCE', value: 'pcode', text: 'pname', + select: function (item) { + if (item) { + $('#F_CityId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_CITY/GetListByProvinceCode", + param: { ProvinceCode: item.pcode }, + value: 'CCODE', + text: 'CNAME' + }); + } else { + $('#F_CityId').lrselectRefresh({ + url: "", + data: [] + }); + } + $('#F_CountyId').lrselectRefresh({ + url: "", + data: [] + }); + } + }); + $('#F_CityId').lrselect({ + value: 'ccode', text: 'cname', + select: function (item) { + if (item) { + $('#F_CountyId').lrselectRefresh({ + url: top.$.rootUrl + "/DIC_AREA/GetAreasListByCityCode", + param: { cityCode: item.CCODE }, + value: 'ACODE', + text: 'ANAME' + }); + } + } + }); + $('#F_CountyId').lrselect({ + value: 'ACODE', text: 'ANAME' + }); + $('#ClassNo').lrselect({ + value: "classno", + text: "classname" + }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: 'value', + text: 'text' + }); + $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' }); + $('#F_SchoolId').lrDataSourceSelect({ code: 'company', value: 'f_companyid', text: 'f_fullname' }); + $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + $('#PartyFaceNo').lrDataSourceSelect({ code: 'BCdPartyFace', value: 'partyfaceno', text: 'partyface' }); + $('#HealthStatusNo').lrDataSourceSelect({ code: 'BCdHealthStatus', value: 'healthstatusno', text: 'healthstatus' }); + $('#Photo').lrUploader(); + $('#FamilyOriginNo').lrDataSourceSelect({ code: 'BCdFamilyOrigin', value: 'familyoriginno', text: 'familyorigin' }); + $('#OverseasChineseNo').lrDataSourceSelect({ code: 'BCdOverseasChinese', value: 'overseaschineseno', text: 'overseaschinesename' }); + $('#GraduateNo').lrDataItemSelect({ code: 'CollegeType' }); + $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); + $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); + $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); + $('#DeptNo').lrselect({ + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" } + }); + } + else { + $('#MajorNo').lrselectRefresh({ + url: "", + data: [] + }); + } + $('#ClassNo').lrselectRefresh({ + url: "", + data: [] + }); + } + }); + $('#MajorNo').lrselect({ + value: "majorno", + text: "majorname", + select: function (item) { + if (item) { + $('#ClassNo').lrselectRefresh({ + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', + param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + }); + } + + } + }); + + + $('#MajorNo').on("click", + function () { + var data = $('#DeptNo').lrselectGet(); + if (!data) { + learun.alert.error('请先选择系'); + } + }); + $('#ClassNo').on("click", + function () { + var data1 = $('#DeptNo').lrselectGet(); + var data2 = $('#MajorNo').lrselectGet(); + if (!data1 || !data2) { + learun.alert.error('请先选择系和专业'); + } + }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + $('#IsTran').val('0'); + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); + +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml index 85e50b95a..26fa92a7c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.cshtml @@ -40,6 +40,7 @@
 录入 +  异动转入  修改  删除  查看 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js index bb7223822..632c45f9c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Index.js @@ -37,6 +37,19 @@ var bootstrap = function ($, learun) { } }); }); + // 异动转入 + $('#lt_transaction').on('click', function () { + learun.layerForm({ + id: 'form', + title: '异动转入', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormTran', + width: 800, + height: 600, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); // 编辑 $('#lr_edit').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); @@ -169,7 +182,7 @@ var bootstrap = function ($, learun) { } }) }) - + //查看异动 $("#lr_searchChange").on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); @@ -346,12 +359,12 @@ var bootstrap = function ($, learun) { { label: "联系电话", name: "mobile", width: 100, align: "left" }, { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, - { - label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", - formatter: function (cellvalue) { - return cellvalue == "1" ? "" : ""; - } - }, + //{ + // label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", + // formatter: function (cellvalue) { + // return cellvalue == "1" ? "" : ""; + // } + //}, { label: "审核状态", name: "CheckMark", width: 80, align: "center", formatter: function (cellvalue) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 75b9fc77e..004135c32 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1081,6 +1081,7 @@ + @@ -7551,6 +7552,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 8ecf1a84b..2daf2e7f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -742,7 +742,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] public List StuPunishmentList { get; set; } [NotMapped] public List StuScoreClassOneList { get; set; } - + [NotMapped] public string IsTran { get; set; } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index a31760d11..9b6f0d8ec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -681,6 +681,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); + if (entity.IsTran == "0") + { + StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity + { + Id = Guid.NewGuid().ToString(), + StuNo = entity.StuNo, + StuName = entity.StuName, + DeptNo = entity.DeptNo, + MajorNo = entity.MajorNo, + ClassNo = entity.ClassNo, + StuChangeRemark = entity.Remark, + NewDeptNo = entity.DeptNo, + NewMajorNo = entity.MajorNo, + NewClassNo = entity.ClassNo, + CreateUserId = entity.StuNo, + StuChangeType = "04", + StuChangeReason = "10", + CreateTime = DateTime.Now, + }; + this.BaseRepository("CollegeMIS").Insert(stuinfoChange); + } this.BaseRepository("CollegeMIS").Insert(entity); } }