diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs index 7b236aaa7..c6e3f41aa 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs @@ -1,5 +1,6 @@ using Learun.Application.TwoDevelopment.EducationalAdministration; using Learun.Util; +using System; using System.Collections.Generic; using System.Data; using System.Web.Mvc; @@ -176,6 +177,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers StuTransferInfoEntity entity = strEntity.ToObject(); entity.AnomalousType = "04"; entity.ChangeReason = "转入"; + entity.StuId= Guid.NewGuid().ToString(); stuTransferInfoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } 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 8e8e65125..32f26563d 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 @@ -58,23 +58,23 @@ -
+
-
+
-
+
异动类型*
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
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 10f04bbc6..acbc18c60 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 @@ -712,17 +712,11 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - onSelectRow: function (rowdata) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - // 合并两个数组 - list = list.concat(selectedRow) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -730,11 +724,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml index 6e82e5f56..1c9727663 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml @@ -61,101 +61,101 @@
-
+
@*转入班级*@ -
转入班级
-
+
转入班级
+
系部*
-
+
专业*
-
+
年级*
-
+
班级*
-
+
入班日期*
@*转入学生信息*@ -
转入学生信息
-
+
转入学生信息
+
转学前学校
-
+
转学前年级
-
+
转学前班级
-
+
转学前专业
-
+
转学前学号
-
+
转学日期
-
+
姓名*
-
+
学号*
-
+
证件类型*
-
+
证件号码*
-
+
出生日期
-
+
性别*
-
+
民族
-
+
户口所在地
-
+
籍贯
-
+
是否住宿
-
+
联系电话
-
+
家庭地址
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js index 9d43d124e..43eff40b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js @@ -827,25 +827,18 @@ var bootstrap = function ($, learun) { rows: 100, isMultiselect: true, onSelectRow: function (rowdata, type) { - //console.log(rowdata) - //console.log(type) - if (type) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - list = list.concat(selectedRow) - let temp = {} - list = list.reduce((prev, curv) => { - if (temp[curv.StuNo]) { } - else { - temp[curv.StuNo] = true - prev.push(curv) - } - return prev - }, []) - } + list.push(rowdata) + let temp = {} + list = list.reduce((prev, curv) => { + if (temp[curv.StuNo]) { } + else { + temp[curv.StuNo] = true + prev.push(curv) + } + return prev + }, []) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml index 36c878bf7..7db8c18e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml @@ -112,35 +112,36 @@
-
+
异动类型*
-
+
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
-
-
异动原因
- -
-
+
休学年限*
-
-
休学时段(文本框暂时)*
+
+
休学时段*
+
+
异动原因
+ +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js index 0cbb30522..7b09fbff7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js @@ -728,17 +728,11 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - onSelectRow: function (rowdata) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - // 合并两个数组 - list = list.concat(selectedRow) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -746,11 +740,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml index 7ff56be80..87caeb4c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml @@ -54,35 +54,35 @@
-
+
异动类型*
-
+
恢复学籍*
-
+
恢复账号*
-
+
入班日期*
-
+
系部*
-
+
专业*
-
+
年级*
-
+
班级*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js index 17c840668..e2bd42592 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js @@ -830,17 +830,11 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - onSelectRow: function (rowdata) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - // 合并两个数组 - list = list.concat(selectedRow) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -848,11 +842,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml index 2c92417f2..68c75ba61 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml @@ -58,23 +58,23 @@
-
+
-
+
-
+
异动类型*
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js index 170469ab0..cac7fdde1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js @@ -713,17 +713,11 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - onSelectRow: function (rowdata) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - // 合并两个数组 - list = list.concat(selectedRow) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -731,11 +725,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); 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 66ce5b524..e8e5d00e5 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 @@ -845,7 +845,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration case "04": //转入 #region 学籍表加数据 var stuInfoBasicEntity = new StuInfoBasicEntity(); - stuInfoBasicEntity.Create(); + stuInfoBasicEntity.StuId = upTrua.StuId; stuInfoBasicEntity.StuNo = upTrua.StuNo; stuInfoBasicEntity.StuName = upTrua.StuName; stuInfoBasicEntity.DeptNo = upTrua.DeptNo;