From 255a427c05037da506ca9d891e2c4e24887c59db Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Thu, 2 Feb 2023 10:21:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=E8=BD=AC=E5=85=A5=EF=BC=9A?= =?UTF-8?q?=E5=AF=B9=E5=BC=82=E5=8A=A8=E8=A1=A8=E9=9D=9E=E7=A9=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5StuId=E8=B5=8B=E5=80=BC=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 2 ++ .../StuTransferInfo/StuTransferInfoService.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 87e7398a3..e98b91944 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.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 4fc778d81..75b405d26 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 @@ -842,7 +842,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; From e13498e674fa7ccc4ece1cacc5f51d7132fdee0c Mon Sep 17 00:00:00 2001 From: libo Date: Thu, 2 Feb 2023 15:50:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E5=AD=A6?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BD=AC=E4=B8=93=E4=B8=9A=E9=A1=B5=E9=9D=A2=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/IntoIndex.cshtml | 52 +++++++++---------- .../Views/StuTransferInfo/MajorIndex.js | 29 ++++------- 2 files changed, 37 insertions(+), 44 deletions(-) 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); } From 30e6160434f734eacca8928ec0e706623a2c9fc3 Mon Sep 17 00:00:00 2001 From: libo Date: Thu, 2 Feb 2023 17:05:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E4=B8=93?= =?UTF-8?q?=E4=B8=9A=E4=B9=8B=E5=A4=96=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=A4=9A=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/DropOutIndex.cshtml | 12 ++++----- .../Views/StuTransferInfo/DropOutIndex.js | 19 +++++--------- .../StuTransferInfo/RestAgainIndex.cshtml | 25 ++++++++++--------- .../Views/StuTransferInfo/RestAgainIndex.js | 19 +++++--------- .../Views/StuTransferInfo/ReturnIndex.cshtml | 16 ++++++------ .../Views/StuTransferInfo/ReturnIndex.js | 19 +++++--------- .../Views/StuTransferInfo/RolloffIndex.cshtml | 12 ++++----- .../Views/StuTransferInfo/RolloffIndex.js | 19 +++++--------- 8 files changed, 57 insertions(+), 84 deletions(-) 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/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 04248d0aa..e52bd6f89 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); } });