From 8cdcda8e37f78c9e4cdc2c639a5f9d2ed9b0b508 Mon Sep 17 00:00:00 2001 From: libo Date: Sat, 14 Jan 2023 09:50:11 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=91=E5=AD=A6?= =?UTF-8?q?=E5=A4=8D=E5=AD=A6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuTransferInfo/RestAgainIndex.cshtml | 222 +++++++++++------- .../Views/StuTransferInfo/RestAgainIndex.js | 9 + 2 files changed, 151 insertions(+), 80 deletions(-) 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 aa408c6aa..a662a0d17 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 @@ -2,97 +2,159 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } -
-
-
-
-
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- + + + +
+
+
+
+
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+ +
+
+
+
+ +
+
+
+ +
+
+
+
异动类型*
+
+
+
+
注销账号*
+
+
+
+
保留学籍*
+
+
+
+
离班日期*
+ +
+
+
异动原因
+ +
+
+
休学年限*
+ +
+
+
休学时段(文本框暂时)*
+ - @*
-
- 点击
-
*@ -
-
-
-
-
-
-
-
-
-
-
异动类型*
-
-
-
-
注销账号*
-
-
-
-
保留学籍*
-
-
-
-
离班日期*
- -
-
-
异动原因
- -
-
-
休学年限*
- -
-
-
休学时段(文本框暂时)*
- - @**@ + @*
+ 提交 +
*@ +
+ +
+
+
+ tab22222
+ + + + + + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js") 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 616770f4d..e26f4dd52 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 @@ -10,6 +10,15 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#navultab li').on('click', function () { + if (!$(this).hasClass('active')) { + $(this).parent().find('.active').removeClass('active'); + $(this).addClass('active'); + $('#condivtab .condiv').eq($(this).index()).siblings().hide() + $('#condivtab .condiv').eq($(this).index()).show() + } + }) + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 280, 400); From 80ce3533a94d1280b1d2942903419e4b46e2f3a3 Mon Sep 17 00:00:00 2001 From: ndbs Date: Sat, 14 Jan 2023 11:35:21 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6=20?= =?UTF-8?q?=E5=A4=8D=E5=AD=A6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 12 +- .../StuTransferInfo/RestAgainIndex.cshtml | 198 ++-- .../Views/StuTransferInfo/RestAgainIndex.js | 1 + .../Views/StuTransferInfo/ReturnIndex.cshtml | 97 ++ .../Views/StuTransferInfo/ReturnIndex.js | 850 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + 6 files changed, 1062 insertions(+), 98 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js 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 34cc975ee..ce2cb140d 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 @@ -47,7 +47,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// - /// 休学复学 + /// 休学 /// /// [HttpGet] @@ -55,6 +55,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + + /// + /// 复学 + /// + /// + public ActionResult ReturnIndex() + { + return View(); + } + /// /// 退学页 /// 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 a662a0d17..f3d4a70e9 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 @@ -3,28 +3,31 @@ Layout = "~/Views/Shared/_Index.cshtml"; } -
+
-
-
+
+
异动类型*
@@ -91,6 +91,10 @@
+ +
+ 提交 +
From c3cf3f302c169a2debc7850d2e36711650a7f024 Mon Sep 17 00:00:00 2001 From: libo Date: Mon, 30 Jan 2023 14:32:44 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E8=BD=AC=E4=B8=93=E4=B8=9A=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/MajorIndex.cshtml | 2 +- .../Views/StuTransferInfo/MajorIndex.js | 53 ++++++++++--------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml index 3e53621f8..5222f8029 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml @@ -116,7 +116,7 @@
-
+
提交
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 a2d035bde..06fd384ed 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 @@ -411,7 +411,9 @@ var bootstrap = function ($, learun) { ], mainId: 'AAIId', }); - + $('#subbtn').on('click', function () { + console.log('123') + }) }, // 初始化列表 initGird: function () { @@ -805,29 +807,31 @@ 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) - // 去重 - let temp = {} - list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 - if (temp[curv.StuNo]) { } - else { - temp[curv.StuNo] = true - prev.push(curv) - } - return prev - }, []) - //console.log('resources', list) + 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 + }, []) + } + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); + + } }); @@ -842,7 +846,4 @@ var bootstrap = function ($, learun) { page.search(); }; page.init(); -} -function delbtn() { - console.log('111111') } \ No newline at end of file From b6180c203ae5e3a94a872c85015e348d45cbb359 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 30 Jan 2023 16:30:02 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E8=BD=AC=E4=B8=93=E4=B8=9A=E6=8F=90=E4=BA=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 4 ++-- .../Views/StuTransferInfo/MajorIndex.cshtml | 10 +++++----- .../Views/StuTransferInfo/MajorIndex.js | 20 +++++++++++++++---- 3 files changed, 23 insertions(+), 11 deletions(-) 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 ce2cb140d..d210bccf0 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 @@ -64,7 +64,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - + /// /// 退学页 /// @@ -181,7 +181,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// 实体 /// [HttpPost] - [ValidateAntiForgeryToken] + //[ValidateAntiForgeryToken] [AjaxOnly] public ActionResult SaveForm(StuTransferInfoEntity entity, string strStuEntity) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml index 5222f8029..1c531168b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml @@ -86,14 +86,14 @@
专业*
-
-
班级*
-
-
年级*
+
+
班级*
+
+
入班日期*
@@ -104,7 +104,7 @@
异动类型*
-
+
保留学籍*
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 06fd384ed..811d8bf3f 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 @@ -234,7 +234,8 @@ var bootstrap = function ($, learun) { value: "classno", text: "classname" }); - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#AnomalousType').lrselectSet("01"); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); // 刷新 @@ -412,7 +413,18 @@ var bootstrap = function ($, learun) { mainId: 'AAIId', }); $('#subbtn').on('click', function () { - console.log('123') + //if (!$('body').lrValidform()) { + // return false; + //} + var entity = $('body').lrGetFormData(); + var strStuEntity = $('#selgridtab').jfGridGet('rowdatas'); + + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm?entity=' + entity, strStuEntity, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); }) }, // 初始化列表 @@ -807,7 +819,7 @@ var bootstrap = function ($, learun) { isPage: true, rows: 100, isMultiselect: true, - onSelectRow: function (rowdata,type) { + onSelectRow: function (rowdata, type) { console.log(rowdata) console.log(type) @@ -831,7 +843,7 @@ var bootstrap = function ($, learun) { $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - + } }); From dd8387f01153ba5a289493cc4dbe061f04845b46 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 30 Jan 2023 17:47:19 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E8=BD=AC=E4=B8=93=E4=B8=9A=E6=8F=90=E4=BA=A4=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/MajorIndex.js | 23 ++++++++++--------- .../StuTransferInfo/StuTransferInfoService.cs | 2 ++ 2 files changed, 14 insertions(+), 11 deletions(-) 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 811d8bf3f..a719087ad 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 @@ -413,18 +413,19 @@ var bootstrap = function ($, learun) { mainId: 'AAIId', }); $('#subbtn').on('click', function () { - //if (!$('body').lrValidform()) { - // return false; - //} + if (!$('body').lrValidform()) { + return false; + } var entity = $('body').lrGetFormData(); - var strStuEntity = $('#selgridtab').jfGridGet('rowdatas'); - - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm?entity=' + entity, strStuEntity, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); + var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, + //function (res) { + // // 保存成功后才回调 + // if (!!callBack) { + // callBack(res); + // } + //} + ); }) }, // 初始化列表 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 31532efab..0cc74429f 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 @@ -226,6 +226,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var InsertEntity = new StuTransferInfoEntity(); //历史数据 + //InsertEntity.ID = Guid.NewGuid().ToString(); InsertEntity.StuId = item.StuId; InsertEntity.StuNo = item.StuNo; InsertEntity.StuName = item.StuName; @@ -249,6 +250,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.StuStatus = entity.StuStatus; InsertEntity.F_WriteMark = entity.F_WriteMark; + InsertEntity.Create(); //添加数据 entitylist.Add(InsertEntity); } From 27287132a776f7834011369c0424232019ed7901 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 31 Jan 2023 11:15:25 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E5=BC=82=E5=8A=A8=E6=8F=90=E4=BA=A4=E5=A2=9E=E5=8A=A0=E5=8E=BB?= =?UTF-8?q?=E9=87=8D=E9=AA=8C=E8=AF=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuTransferInfo/StuTransferInfoService.cs | 69 +++++++++++++++++-- 1 file changed, 63 insertions(+), 6 deletions(-) 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 0cc74429f..2856f9c2f 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 @@ -193,7 +193,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration else { entity.Create(); - this.BaseRepository("CollegeMIS").Insert(entity); + //去重验证 + if (entity.AnomalousType == "04")//转入 + { + if (this.BaseRepository("CollegeMIS").FindEntity(x => + x.AnomalousType == entity.AnomalousType && x.StuName == entity.StuName && + x.StuNo == entity.StuNo && x.IdentityCardNo == entity.IdentityCardNo) == null) + { + //添加数据 + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + else + { + this.BaseRepository("CollegeMIS").Insert(entity); + } } } catch (Exception ex) @@ -245,14 +259,46 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.NewDeptNo = entity.NewDeptNo; InsertEntity.NewGrade = entity.NewGrade; InsertEntity.LeaveDate = entity.LeaveDate; - InsertEntity.StuStatus = entity.StuStatus; + InsertEntity.SuspensionBeginTime = entity.SuspensionBeginTime; + InsertEntity.SuspensionEndTime = entity.SuspensionEndTime; + InsertEntity.SuspensionPeriod = entity.SuspensionPeriod; // InsertEntity.StuStatus = entity.StuStatus; InsertEntity.F_WriteMark = entity.F_WriteMark; InsertEntity.Create(); - //添加数据 - entitylist.Add(InsertEntity); + //去重验证 + if (InsertEntity.AnomalousType == "01" || InsertEntity.AnomalousType == "07" || InsertEntity.AnomalousType == "08")//转专业、转班、留级 + { + if (this.BaseRepository("CollegeMIS").FindEntity(x => + x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.DeptNo == InsertEntity.DeptNo && x.MajorNo == InsertEntity.MajorNo && + x.ClassNo == InsertEntity.ClassNo && x.Grade == InsertEntity.Grade && x.NewDeptNo == InsertEntity.NewDeptNo && x.NewMajorNo == InsertEntity.NewMajorNo && + x.NewClassNo == InsertEntity.NewClassNo && x.NewGrade == InsertEntity.NewGrade) == null) + { + //添加数据 + entitylist.Add(InsertEntity); + } + } + else if (InsertEntity.AnomalousType == "06")//休学 + { + if (this.BaseRepository("CollegeMIS").FindEntity(x => + x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate && x.SuspensionPeriod == InsertEntity.SuspensionPeriod && + x.SuspensionBeginTime == InsertEntity.SuspensionBeginTime && x.SuspensionEndTime == InsertEntity.SuspensionEndTime) == null) + { + //添加数据 + entitylist.Add(InsertEntity); + } + } + else if (InsertEntity.AnomalousType == "02" || InsertEntity.AnomalousType == "05")//退学、转出 + { + if (this.BaseRepository("CollegeMIS").FindEntity(x => + x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.EnteDate == InsertEntity.EnteDate) == null) + { + //添加数据 + entitylist.Add(InsertEntity); + } + } + } db.Insert(entitylist); //创建学籍异动信息 @@ -312,8 +358,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //恢复学籍,恢复账号 InsertEntity.RecoverStuStatus = entity.RecoverStuStatus; InsertEntity.RecoverWriteMark = entity.RecoverWriteMark; - //添加数据 - entitylist.Add(InsertEntity); + + InsertEntity.Create(); + //去重验证 + if (InsertEntity.AnomalousType == "03")//复学 + { + if (this.BaseRepository("CollegeMIS").FindEntity(x => + x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate && + x.NewDeptNo==InsertEntity.NewDeptNo && x.NewMajorNo == InsertEntity.NewMajorNo && x.NewClassNo==InsertEntity.NewClassNo && x.NewGrade==InsertEntity.NewGrade) == null) + { + //添加数据 + entitylist.Add(InsertEntity); + } + } } db.Insert(entitylist); //创建学籍异动信息 db.Commit(); From 123b5fd3a5d07a36d02a989aa0af7f75c386ca2b Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 31 Jan 2023 11:16:01 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 2 +- .../Views/StuTransferInfo/CheckIndex.js | 29 +++++++++++++++---- .../StuTransferInfo/StuTransferInfoEntity.cs | 4 +-- .../StuTransferInfo/StuTransferInfoService.cs | 5 ++-- 4 files changed, 28 insertions(+), 12 deletions(-) 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 d210bccf0..6ddcec7b2 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 @@ -181,7 +181,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// 实体 /// [HttpPost] - //[ValidateAntiForgeryToken] + [ValidateAntiForgeryToken] [AjaxOnly] public ActionResult SaveForm(StuTransferInfoEntity entity, string strStuEntity) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js index 65a37905b..9da0b9451 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js @@ -29,6 +29,12 @@ var bootstrap = function ($, learun) { $('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); $('#F_EnabledMark').lrDataItemSelect({ code: 'YesOrNoInt' }); + + $('#F_EnabledMark').lrselect({ + data: [{ text: "作废", value: "0" }, { text: "未审核", value: "1" }, { text: "已审核", value: "2" }], + text: "text", + value: "value" + }) // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -80,9 +86,14 @@ var bootstrap = function ($, learun) { headData: [ { label: '姓名', name: 'StuName', width: 100, align: "left" }, { label: '学号', name: 'StuNo', width: 150, align: "left" }, - { label: '性别', name: 'Gender', width: 100, align: "left" }, { - label: '异动类型', name: 'AnomalousType', width: 150, align: "left", + label: '性别', name: 'Gender', width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: '异动类型', name: 'AnomalousType', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { key: value, @@ -106,7 +117,7 @@ var bootstrap = function ($, learun) { } }, //{ label: '身份证号', name: 'IdentityCardNo', width: 160, align: "left" }, - + { label: '异动前班级', name: 'ClassNo', width: 140, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -159,7 +170,7 @@ var bootstrap = function ($, learun) { // }); // } //}, - + { label: '异动后班级', name: 'NewClassNo', width: 140, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -242,7 +253,13 @@ var bootstrap = function ($, learun) { { label: '审核状态', name: 'F_EnabledMark', width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已审核" : "未审核"; + if (cellvalue == "0") { + return "未审核"; + } else if (cellvalue == "1") { + return "已审核"; + } else if (cellvalue == "2") { + return "作废"; + } } }, { @@ -329,7 +346,7 @@ var bootstrap = function ($, learun) { mainId: 'ID', isPage: true, rows: 100, - sidx: 'F_EnabledMark asc,CreateUserId asc', + sidx: 'F_EnabledMark asc,CreateUserId asc,CreateTime desc', isMultiselect: true }); page.search(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs index b452f9ea0..bcd646fff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs @@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CHECKUSERID")] public string CheckUserId { get; set; } /// - /// 审核状态0否1是 + /// 审核状态//0未审核,1已审核 2 作废 /// /// [Column("F_ENABLEDMARK")] @@ -336,7 +336,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration UserInfo userInfo = LoginUserInfo.Get(); this.CreateTime = DateTime.Now; this.CreateUserId = userInfo.userId; - this.F_EnabledMark = 0;//审核状态默认为未审核 + this.F_EnabledMark = 0;//0未审核,1已审核 2 作废 this.IsReturnSchool = "1"; } /// 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 0cc74429f..308243ce1 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 @@ -103,7 +103,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("StuStatus", queryParam["StuStatus"].ToString(), DbType.String); strSql.Append(" AND t.StuStatus = @StuStatus "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -226,7 +226,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { var InsertEntity = new StuTransferInfoEntity(); //历史数据 - //InsertEntity.ID = Guid.NewGuid().ToString(); InsertEntity.StuId = item.StuId; InsertEntity.StuNo = item.StuNo; InsertEntity.StuName = item.StuName; @@ -245,7 +244,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.NewDeptNo = entity.NewDeptNo; InsertEntity.NewGrade = entity.NewGrade; InsertEntity.LeaveDate = entity.LeaveDate; - InsertEntity.StuStatus = entity.StuStatus; + InsertEntity.ChangeReason = entity.Remark; // InsertEntity.StuStatus = entity.StuStatus; InsertEntity.F_WriteMark = entity.F_WriteMark; From 5f5c0bf56004fcc1094910b45be91ea304ab90cf Mon Sep 17 00:00:00 2001 From: libo Date: Tue, 31 Jan 2023 11:19:40 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/MajorIndex.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 a719087ad..08fe5bef8 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 @@ -419,12 +419,18 @@ var bootstrap = function ($, learun) { var entity = $('body').lrGetFormData(); var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, - //function (res) { - // // 保存成功后才回调 - // if (!!callBack) { - // callBack(res); - // } - //} + function (res) { + console.log(res) + if (res.code == 200) { + setTimeout(function () { + location.reload(); + }, 100) + } + // 保存成功后才回调 + //if (!!callBack) { + // callBack(res); + //} + } ); }) }, From e50fd24df9a9350c6a2beeafca032a9ae295b84b Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 31 Jan 2023 14:57:46 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E5=85=A5=E8=BD=AC=E5=87=BA=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 15 +- ...{InAndOutIndex.cshtml => IntoIndex.cshtml} | 2 +- .../{InAndOutIndex.js => IntoIndex.js} | 0 .../StuTransferInfo/RestAgainIndex.cshtml | 2 +- .../Views/StuTransferInfo/RestAgainIndex.js | 3 + .../Views/StuTransferInfo/ReturnIndex.cshtml | 2 +- .../Views/StuTransferInfo/ReturnIndex.js | 3 + .../Views/StuTransferInfo/RolloffIndex.cshtml | 98 +++ .../Views/StuTransferInfo/RolloffIndex.js | 739 ++++++++++++++++++ .../Learun.Application.Web.csproj | 6 +- 10 files changed, 860 insertions(+), 10 deletions(-) rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/{InAndOutIndex.cshtml => IntoIndex.cshtml} (99%) rename Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/{InAndOutIndex.js => IntoIndex.js} (100%) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js 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 6ddcec7b2..6ea3743da 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 @@ -28,10 +28,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 表单页 转入 - /// - /// [HttpGet] public ActionResult Form() { @@ -79,7 +75,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// /// [HttpGet] - public ActionResult InAndOutIndex() + public ActionResult IntoIndex() + { + return View(); + } + /// + /// 转入转出页 + /// + /// + [HttpGet] + public ActionResult RollofftIndex() { return View(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/InAndOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml similarity index 99% rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/InAndOutIndex.cshtml rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml index aa408c6aa..4f9471890 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/InAndOutIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml @@ -95,4 +95,4 @@
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js") +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/InAndOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js similarity index 100% rename from Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/InAndOutIndex.js rename to Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js 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 0bfd08c56..bad644e7a 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 @@ -143,7 +143,7 @@
-
+
提交
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 0e9d79a6f..23da5a901 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 @@ -18,6 +18,9 @@ var bootstrap = function ($, learun) { $('#condivtab .condiv').eq($(this).index()).show() } }) + $('#SubmitBtn').on('click', function () { + console.log('123465') + }) $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/ReturnIndex"); $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { 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 582ef4b45..5d1064f09 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 @@ -92,7 +92,7 @@
-
+
提交
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 713af2973..23f0381a2 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 @@ -13,6 +13,9 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 280, 400); + $('#SubmitBtn').on('click', function () { + console.log('123465') + }) $('#DeptNo').lrselect({ allowSearch: true, value: "deptno", 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 new file mode 100644 index 000000000..83f6f3879 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml @@ -0,0 +1,98 @@ +@{ + ViewBag.Title = "学籍异动列表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+ +
+
+
+
+ + @*
+
+ 点击 +
+
*@ +
+
+
+ +
+
+
+
+ +
+
+
+
异动类型*
+
+
+
+
注销账号*
+
+
+
+
保留学籍*
+
+
+
+
离班日期*
+ +
+
+
异动原因
+ +
+
+
休学年限*
+ +
+
+
休学时段(文本框暂时)*
+ + @**@ +
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/RollofftIndex.js") 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 new file mode 100644 index 000000000..616770f4d --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js @@ -0,0 +1,739 @@ +var refreshGirdData; +var StuId; +var tempdatra = new Array(); +var list = []; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 280, 400); + $('#DeptNo').lrselect({ + allowSearch: true, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + + } + }); + $('#MajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + select: function (item) { + var Grades = $("#Grade").lrselectGet(); + if (Grades != null && Grades != "" && Grades != "undefined") { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } else { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + } + }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + select: function (item) { + var MajorNos = $("#MajorNo").lrselectGet(); + if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } else { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + value: "classno", + text: "classname" + }); + //提交下拉框 + + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); + $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行查看！"); + return; + } + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, + width: 1162, + height: 600, + btn: null + }); + } + }); + $('#selgridtab').jfGrid({ + headData: [ + //{ + // label: "审核状态", name: "CheckMark", width: 80, align: "center", + // formatter: function (cellvalue) { + // return cellvalue == "1" ? "已审核" : "未审核"; + // } + //}, + { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, }, + { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, }, + { label: "学号", name: "ProvinceCode", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, + formatter: function (value) { + return learun.formatDate(value, 'yyyy-MM-dd'); + } + }, + { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "民族", name: "NationalityNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'National', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + //{ + // label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'PolityStatus', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + //{ + // label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'QRCodeHealthStatus', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'StudyModality', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, + //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" }, + //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, + //{ label: "余额", name: "Balance", width: 100, align: "left" }, + { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, + { label: "联系电话", name: "mobile", width: 100, align: "left" }, + { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, + { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, + { + label: "操作", name: "Delete", width: 100, align: "center", + formatter: function (callback, cellvalue, row, op, $cell) { + var $div = $('
'); + var $hbtn = $(' 移除'); + $hbtn.on('click', function () { + tempdatra.map((item, index) => { + if (item.StuNo == cellvalue.StuNo) { + tempdatra.splice(index, 1) + } + }); + //console.log(tempdatra) + $('#selgridtab').jfGridSet('refreshdata', tempdatra); + + }); + $div.append($hbtn); + return $div; + } + }, + ], + mainId: 'AAIId', + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + headData: [ + //{ + // label: "审核状态", name: "CheckMark", width: 80, align: "center", + // formatter: function (cellvalue) { + // return cellvalue == "1" ? "已审核" : "未审核"; + // } + //}, + { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, }, + { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, }, + { label: "学号", name: "ProvinceCode", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, + formatter: function (value) { + return learun.formatDate(value, 'yyyy-MM-dd'); + } + }, + { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "民族", name: "NationalityNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'National', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + //{ + // label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'PolityStatus', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + //{ + // label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'QRCodeHealthStatus', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'StudyModality', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, + //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" }, + //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, + //{ label: "余额", name: "Balance", width: 100, align: "left" }, + { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, + { label: "联系电话", name: "mobile", width: 100, align: "left" }, + { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, + { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, + //{ + // label: "五年一贯制", name: "FiveYear", width: 100, align: "left" + // , formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'PieceCultivateWay', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", + // formatter: function (cellvalue) { + // return cellvalue == "1" ? "" : ""; + // } + //}, + //{ + // label: "是否上传头像", name: "Photo", width: 80, align: "center", + // formatter: function (cellvalue) { + // if (cellvalue != null && cellvalue != "" && cellvalue != undefined) { + // return cellvalue = "是"; + // } else { + // return cellvalue = "否"; + // } + // } + //}, + //{ label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true }, + //{ label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true }, + //{ + // label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'BCdCountry', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'BCdOverseasChinese', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'BCdOverseasChinese', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, }, + //{ label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, }, + //{ label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, }, + //{ label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, }, + //{ label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, }, + //{ label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, }, + //{ label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, }, + //{ label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, }, + //{ + // label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'StuLivePlaceType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'StuHealthType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, }, + //{ label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, }, + //{ label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, }, + //{ + // label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'RecruitWay', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'RecruitCooperateType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, }, + //{ label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, }, + //{ label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, }, + //{ label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, }, + //{ label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, }, + //{ label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, }, + //{ label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, }, + //{ label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, }, + //{ label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, }, + //{ label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, }, + //{ label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true }, + //{ + // label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'GuardianType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, }, + //{ + // label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true, + // formatter: function (value) { + // return learun.formatDate(value, 'yyyy-MM-dd'); + // } + //}, + //{ + // label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'IdCardType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, }, + //{ + // label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'National', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'EpiHealth', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, }, + //{ label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, }, + //{ label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true }, + //{ + // label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'GuardianType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, }, + //{ + // label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true, + // formatter: function (value) { + // return learun.formatDate(value, 'yyyy-MM-dd'); + // } + //}, + //{ + // label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'IdCardType', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, }, + //{ + // label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'National', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ + // label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true, + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'EpiHealth', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + //}, + //{ label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, }, + //{ label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, }, + + ], + mainId: 'StuId', + 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) + // 去重 + let temp = {} + list = list.reduce((prev, curv) => { + // 若临时对象中有一模一样的item，则什么都不做 + if (temp[curv.StuNo]) { } + else { + temp[curv.StuNo] = true + prev.push(curv) + } + return prev + }, []) + //console.log('resources', list) + } + console.log(list) + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); + } + + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} +function delbtn() { + console.log('111111') +} \ No newline at end of file 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 512238d3e..3c4423b90 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 @@ -1362,8 +1362,9 @@ + - + @@ -8045,8 +8046,9 @@ - + + From b89a2a8b6d2286f9186214a081fdb051a220db0a Mon Sep 17 00:00:00 2001 From: libo Date: Tue, 31 Jan 2023 15:51:55 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AC=E5=85=A5?= =?UTF-8?q?=E8=BD=AC=E5=87=BA=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/IntoIndex.cshtml | 224 +++++++++++------- .../Views/StuTransferInfo/IntoIndex.js | 13 + 2 files changed, 157 insertions(+), 80 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 4f9471890..3ab3ef1ad 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 @@ -2,97 +2,161 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } -
-
-
-
-
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- + + +
+ +
+ +
+
+
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+ +
-
- @*
-
- 点击 + @*
+
+ 点击 +
+
*@ +
+
+
+
-
*@ -
-
-
-
-
-
+
-
-
-
-
异动类型*
-
-
-
-
注销账号*
-
-
-
-
保留学籍*
-
-
-
-
离班日期*
- -
-
-
异动原因
- -
-
-
休学年限*
- -
-
-
休学时段(文本框暂时)*
- - @**@ +
+
+
+
异动类型*
+
+
+
+
注销账号*
+
+
+
+
保留学籍*
+
+
+
+
离班日期*
+ +
+
+
异动原因
+ +
+
+
休学年限*
+ +
+
+
休学时段(文本框暂时)*
+ + @**@ +
+
+ +
+ +
+
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js index 616770f4d..b2062750b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js @@ -10,9 +10,22 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + + $('#navultab li').on('click', function () { + if (!$(this).hasClass('active')) { + $(this).parent().find('.active').removeClass('active'); + $(this).addClass('active'); + $('#condivtab .condiv').eq($(this).index()).siblings().hide() + $('#condivtab .condiv').eq($(this).index()).show() + } + }) + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 280, 400); + + $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/RolloffIndex"); + $('#DeptNo').lrselect({ allowSearch: true, value: "deptno", From 6b4d5b449b7ca9ce857841b75dcc8d85db711e54 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 31 Jan 2023 16:00:36 +0800 Subject: [PATCH 12/16] --- .../Controllers/StuTransferInfoController.cs | 2 +- .../Views/StuTransferInfo/RolloffIndex.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 6ea3743da..87e7398a3 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 @@ -84,7 +84,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// /// [HttpGet] - public ActionResult RollofftIndex() + public ActionResult RolloffIndex() { return View(); } 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 83f6f3879..f8127522a 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 @@ -95,4 +95,4 @@
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/RollofftIndex.js") +@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js") From 3bfa8c9e2855e467cf48a62a4093a9d62dd04187 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Tue, 31 Jan 2023 18:06:04 +0800 Subject: [PATCH 13/16] =?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=E5=8E=BB=E9=87=8D=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuTransferInfo/StuTransferInfoService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3a34e7ca8..fd1817ebf 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 @@ -254,7 +254,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.AnomalousType = entity.AnomalousType; InsertEntity.ChangeReason = entity.ChangeReason; InsertEntity.NewClassNo = entity.NewClassNo; - InsertEntity.MajorNo = entity.MajorNo; + InsertEntity.NewMajorNo = entity.NewMajorNo; InsertEntity.NewDeptNo = entity.NewDeptNo; InsertEntity.NewGrade = entity.NewGrade; InsertEntity.LeaveDate = entity.LeaveDate; From 7b79806b25a172a86e7c48fd70b01490f576e458 Mon Sep 17 00:00:00 2001 From: ndbs Date: Tue, 31 Jan 2023 18:08:01 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 9 ++++ .../Views/StuTransferInfo/CheckForm.cshtml | 15 +++++++ .../Views/StuTransferInfo/CheckForm.js | 43 +++++++++++++++++++ .../Views/StuTransferInfo/CheckIndex.js | 22 +++++++--- .../Learun.Application.Web.csproj | 2 + 5 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js 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..8ae2c9bca 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 @@ -97,6 +97,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + /// + /// 审核页 + /// + /// + [HttpGet] + public ActionResult CheckForm() + { + return View(); + } #endregion #region 获取数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml new file mode 100644 index 000000000..8aa29a0e4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml @@ -0,0 +1,15 @@ +@{ + ViewBag.Title = "学籍异动列表审核"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
审核状态*
+
+
+
+
审核用户*
+ +
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js new file mode 100644 index 000000000..f7076219a --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js @@ -0,0 +1,43 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-01-04 15:03 + * 描 述：学籍异动列表 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initData(); + page.bind(); + }, + bind: function () { + $('#F_EnabledMark').lrselect({ + data: [{ text: "同意", value: "1" }, { text: "作废", value: "2" }], + text: "text", + value: "value" + }); + $('#CheckUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; + $('#CheckUserId').val(learun.clientdata.get(['userinfo']).realName); + }, + initData: function () { + + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('#form').lrValidform()) { + return false; + } + var postData = $('#form').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js index 9da0b9451..fd6cfa4a2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js @@ -46,17 +46,25 @@ var bootstrap = function ($, learun) { // 审核 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); + console.log(keyValue, "keyValue") if (learun.checkrow(keyValue)) { - var CheckMark = $('#gridtable').jfGridValue('CheckMark'); + var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark'); if (CheckMark.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已审核项目，已审核项不能二次审核！"); + learun.alert.warning("选中记录中包含已审核项，已审核项不能二次审核！"); return; } - learun.layerConfirm('是否确认审核选中项进行学籍异动,该项不可逆转！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); + if (CheckMark.indexOf('2') != -1) { + learun.alert.warning("选中记录中包含已作废项，不可审核！"); + return; + } + learun.layerForm({ + id: 'form', + title: '审核页面', + url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue, + width: 400, + height: 300, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); } }); } 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 3c4423b90..77b6188db 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 @@ -1362,6 +1362,7 @@ + @@ -8049,6 +8050,7 @@ + From 373b4e97b9481314686a52bdf7b2ac13ba9081b6 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 1 Feb 2023 11:43:43 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuTransferInfo/RestAgainIndex.cshtml | 2 +- .../Views/StuTransferInfo/RestAgainIndex.js | 23 ++++++++++++-- .../Views/StuTransferInfo/ReturnIndex.cshtml | 20 ++++++------ .../Views/StuTransferInfo/ReturnIndex.js | 31 ++++++++++++++++--- 4 files changed, 58 insertions(+), 18 deletions(-) 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 bad644e7a..36c878bf7 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 @@ -114,7 +114,7 @@
异动类型*
-
+
注销账号*
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 23da5a901..856591c35 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 @@ -19,7 +19,25 @@ var bootstrap = function ($, learun) { } }) $('#SubmitBtn').on('click', function () { - console.log('123465') + if (!$('body').lrValidform()) { + return false; + } + var entity = $('body').lrGetFormData(); + var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, + function (res) { + console.log(res) + if (res.code == 200) { + setTimeout(function () { + location.reload(); + }, 100) + } + // 保存成功后才回调 + //if (!!callBack) { + // callBack(res); + //} + } + ); }) $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/ReturnIndex"); @@ -138,7 +156,8 @@ var bootstrap = function ($, learun) { }); //提交下拉框 - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#AnomalousType').lrselectSet("06"); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); // 刷新 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 5d1064f09..7ff56be80 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 @@ -39,10 +39,10 @@
@*
-
- 点击 -
-
*@ +
+ 点击 +
+
*@
@@ -56,7 +56,7 @@
异动类型*
-
+
恢复学籍*
@@ -78,20 +78,20 @@
专业*
-
-
班级*
-
-
年级*
+
+
班级*
+
+
异动原因
- +
提交
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 23f0381a2..1fcbf289a 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 @@ -14,7 +14,26 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 280, 400); $('#SubmitBtn').on('click', function () { - console.log('123465') + if (!$('body').lrValidform()) { + return false; + } + var entity = $('body').lrGetFormData(); + entity.AnomalousType = entity.NewAnomalousType; + var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, + function (res) { + console.log(res) + if (res.code == 200) { + setTimeout(function () { + location.reload(); + }, 100) + } + // 保存成功后才回调 + //if (!!callBack) { + // callBack(res); + //} + } + ); }) $('#DeptNo').lrselect({ allowSearch: true, @@ -128,6 +147,7 @@ var bootstrap = function ($, learun) { }); //提交下拉框 + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); $('#NewDeptNo').lrselect({ allowSearch: true, value: "deptno", @@ -238,9 +258,10 @@ var bootstrap = function ($, learun) { value: "classno", text: "classname" }); - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); $('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#NewAnomalousType').lrselectSet("03"); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -428,8 +449,8 @@ var bootstrap = function ($, learun) { // return cellvalue == "1" ? "已审核" : "未审核"; // } //}, - { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, }, - { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, }, + { label: "学生编号", name: "StuNo", width: 100, align: "left" }, + { label: "学籍号", name: "StuCode", width: 100, align: "left" }, { label: "学号", name: "ProvinceCode", width: 100, align: "left" }, { label: "姓名", name: "StuName", width: 100, align: "left" }, { @@ -839,7 +860,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' and (AnomalousType =03 or AnomalousType=02 or AnomalousType=06 ) and IsReturnSchool=0 '; + param.SqlParameter = ' and AnomalousType=06 and IsReturnSchool=0 '; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; From c350f2ad3867ee666af4e965ac5990516aae3068 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 1 Feb 2023 11:59:31 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=B2=BE=E7=AE=80,?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=89=93=E5=8D=B0,=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E7=94=A8js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/CheckIndex.js | 1 - .../Views/StuTransferInfo/DropOutIndex.js | 5 +---- .../Views/StuTransferInfo/IntoIndex.js | 5 +---- .../Views/StuTransferInfo/MajorIndex.js | 6 +++--- .../Views/StuTransferInfo/RestAgainIndex.js | 7 ++----- .../Views/StuTransferInfo/ReturnIndex.js | 9 +++------ .../Views/StuTransferInfo/RolloffIndex.js | 5 +---- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js index fd6cfa4a2..e28704a60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js @@ -46,7 +46,6 @@ var bootstrap = function ($, learun) { // 审核 $('#lr_check').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); - console.log(keyValue, "keyValue") if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark'); if (CheckMark.indexOf('1') != -1) { 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 43e298b2f..1beeab642 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 @@ -715,7 +715,7 @@ var bootstrap = function ($, learun) { }, []) //console.log('resources', list) } - console.log(list) + //console.log(list) tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } @@ -733,6 +733,3 @@ var bootstrap = function ($, learun) { }; page.init(); } -function delbtn() { - console.log('111111') -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js index b2062750b..c9194f72f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js @@ -729,7 +729,7 @@ var bootstrap = function ($, learun) { }, []) //console.log('resources', list) } - console.log(list) + //console.log(list) tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } @@ -747,6 +747,3 @@ var bootstrap = function ($, learun) { }; page.init(); } -function delbtn() { - console.log('111111') -} \ No newline at end of file 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 08fe5bef8..9d43d124e 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 @@ -420,7 +420,7 @@ var bootstrap = function ($, learun) { var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, function (res) { - console.log(res) + //console.log(res) if (res.code == 200) { setTimeout(function () { location.reload(); @@ -827,8 +827,8 @@ var bootstrap = function ($, learun) { rows: 100, isMultiselect: true, onSelectRow: function (rowdata, type) { - console.log(rowdata) - console.log(type) + //console.log(rowdata) + //console.log(type) if (type) { var selectedRow = $('#gridtable').jfGridGet('rowdata'); 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 856591c35..0cbb30522 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 @@ -26,7 +26,7 @@ var bootstrap = function ($, learun) { var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, function (res) { - console.log(res) + //console.log(res) if (res.code == 200) { setTimeout(function () { location.reload(); @@ -748,7 +748,7 @@ var bootstrap = function ($, learun) { }, []) //console.log('resources', list) } - console.log(list) + //console.log(list) tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } @@ -766,6 +766,3 @@ var bootstrap = function ($, learun) { }; page.init(); } -function delbtn() { - console.log('111111') -} \ No newline at end of file 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 1fcbf289a..04248d0aa 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 @@ -22,7 +22,7 @@ var bootstrap = function ($, learun) { var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, function (res) { - console.log(res) + //console.log(res) if (res.code == 200) { setTimeout(function () { location.reload(); @@ -850,7 +850,7 @@ var bootstrap = function ($, learun) { }, []) //console.log('resources', list) } - console.log(list) + //console.log(list) tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } @@ -860,7 +860,7 @@ var bootstrap = function ($, learun) { }, search: function (param) { param = param || {}; - param.SqlParameter = ' and AnomalousType=06 and IsReturnSchool=0 '; + param.SqlParameter = ' and AnomalousType=06 and IsReturnSchool=1 and F_EnabledMark=1 '; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; @@ -869,6 +869,3 @@ var bootstrap = function ($, learun) { }; page.init(); } -function delbtn() { - console.log('111111') -} \ No newline at end of file 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 616770f4d..b06dea42e 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 @@ -716,7 +716,7 @@ var bootstrap = function ($, learun) { }, []) //console.log('resources', list) } - console.log(list) + //console.log(list) tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } @@ -734,6 +734,3 @@ var bootstrap = function ($, learun) { }; page.init(); } -function delbtn() { - console.log('111111') -} \ No newline at end of file