From 30e6160434f734eacca8928ec0e706623a2c9fc3 Mon Sep 17 00:00:00 2001 From: libo Date: Thu, 2 Feb 2023 17:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E4=B8=93=E4=B8=9A?= =?UTF-8?q?=E4=B9=8B=E5=A4=96=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=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); } });