From 31711084dfff85bee8fe8a43f9d80d1f2427c4ce Mon Sep 17 00:00:00 2001 From: edy Date: Wed, 14 Jul 2021 10:05:51 +0800 Subject: [PATCH 1/2] --- .../Controllers/StuEnrollController.cs | 9 + .../Views/StuEnroll/Teacher.cshtml | 69 +++++ .../Views/StuEnroll/Teacher.js | 251 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + 4 files changed, 331 insertions(+) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs index dead205cf..b6fab98b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs @@ -205,6 +205,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// + /// 是否资助(教师) + /// + /// + [HttpGet] + public ActionResult Teacher() + { + return View(); + } + /// /// 完善资助信息 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml new file mode 100644 index 000000000..9c13bb610 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml @@ -0,0 +1,69 @@ +@{ + ViewBag.Title = "新生资助管理"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
系
+
+
+
+
专业
+
+
+
+
班级
+
+
+
+
学年
+
+
+ @*
+
是否资助
+
+
*@ +
+ +
身份证
+ +
+
+
姓名
+ +
+
+
报名号
+ +
+
+
+
+
+
+ @*
+ 资助 + 不资助 + +
*@ +
+ +
+
+  查看 +   完善资助信息 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js new file mode 100644 index 000000000..f55c0a5db --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js @@ -0,0 +1,251 @@ +/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) + * Copyright (c) 2013-2018 北京泉江科技有限公司 + * 创建人：超级管理员 + * 日 期：2019-07-17 11:20 + * 描 述：新生录取管理 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + //page.refreshMoney(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + //page.refreshMoney(); + }, 380, 400); + $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" }); + $('#Year').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass', + value: "year", + text: "year", + }); + + $('#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) { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } + }); + } else { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1" }, + value: "classno", + text: "classname" + }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue, + width: 800, + height: 600, + btn: null + }); + } + }); + + //完善资助信息 + $("#lr_supply").on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '完善信息', + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/IsHelpForm?keyValue=' + keyValue, + width: 600, + height: 450, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + + }); + + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').jfGrid({ + url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList', + headData: [ + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "班级", name: "ClassNo", width: 150, 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: "ResidenceType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'HouseholdCategory', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "享受等级", name: "SupportGrade", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'SupportGrade', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { + label: "资助种类(一等)", name: "SupportType", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getsAsync('dataItem', { + key: value, + code: 'SupportType1', + callback: function (text) { + callback(text); + } + }); + } + }, + { + label: "资助种类(二等)", name: "SupportType1", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getsAsync('dataItem', { + key: value, + code: 'SupportType2', + callback: function (text) { + callback(text); + } + }); + } + + }, + //{ + // label: "资助种类", name: "SupportType", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'SupportType1', + // callback: function (_data) { + // if (_data.text) { + // callback(_data.text); + // } else { + // learun.clientdata.getAsync('dataItem', { + // key: value, + // code: 'SupportType2', + // callback: function (_data) { + // callback(_data.text); + // } + // }); + // } + // } + // }); + // } + //}, + { label: "符合资助条件", name: "SupportCondition", width: 200, align: "left" }, + { label: "创建时间", name: "SupportTime", width: 200, align: "left" }, + { label: "操作人", name: "SupportUserName", width: 100, align: "left" }, + { label: "备注信息", name: "SupportRemarks", width: 200, align: "left" } + ], + //isMultiselect: true, + mainId: 'StuId', + isPage: true, + sord: 'desc', + sidx: 'SupportTime' + }); + page.search(); + }, + refreshMoney: function () { + var deptNo = $("#DeptNo").lrselectGet(); + var majorNo = $("#MajorNo").lrselectGet(); + var classNo = $("#ClassNo").lrselectGet(); + $.post( + top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics', + { + DeptNo: deptNo, + MajorNo: majorNo, + ClassNo: classNo + }, + function (res) { + $("#allAmount").html(res.data.aa); + $("#isAmount").html(res.data.bb); + }, "json"); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = ' AND IsReport=1 AND IsSupport=1'; + param.Grade = "20"; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + }, + + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} 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 6a45e969e..332fd8b2b 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 @@ -1002,6 +1002,7 @@ + @@ -7380,6 +7381,7 @@ + From 22b3917f9d0c7b15bd822d05a752d14686b83a6f Mon Sep 17 00:00:00 2001 From: edy Date: Wed, 14 Jul 2021 14:52:27 +0800 Subject: [PATCH 2/2] --- .../Controllers/StuEnrollController.cs | 9 - .../Views/StuEnroll/Teacher.cshtml | 69 ----- .../Views/StuEnroll/Teacher.js | 251 ------------------ .../Learun.Application.Web.csproj | 3 +- 4 files changed, 1 insertion(+), 331 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs index b6fab98b3..dead205cf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs @@ -205,15 +205,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return View(); } /// - /// 是否资助(教师) - /// - /// - [HttpGet] - public ActionResult Teacher() - { - return View(); - } - /// /// 完善资助信息 /// /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml deleted file mode 100644 index 9c13bb610..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml +++ /dev/null @@ -1,69 +0,0 @@ -@{ - ViewBag.Title = "新生资助管理"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-
-
-
-
系
-
-
-
-
专业
-
-
-
-
班级
-
-
-
-
学年
-
-
- @*
-
是否资助
-
-
*@ -
- -
身份证
- -
-
-
姓名
- -
-
-
报名号
- -
-
-
-
-
-
- @*
- 资助 - 不资助 - -
*@ -
- -
-
-  查看 -   完善资助信息 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js deleted file mode 100644 index f55c0a5db..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js +++ /dev/null @@ -1,251 +0,0 @@ -/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) - * Copyright (c) 2013-2018 北京泉江科技有限公司 - * 创建人：超级管理员 - * 日 期：2019-07-17 11:20 - * 描 述：新生录取管理 - */ -var refreshGirdData; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGird(); - page.bind(); - //page.refreshMoney(); - }, - bind: function () { - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - //page.refreshMoney(); - }, 380, 400); - $("#IsSubsidize1").lrDataItemSelect({ code: "jyYewOrNot" }); - $('#Year').lrselect({ - url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetYearListByClass', - value: "year", - text: "year", - }); - - $('#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) { - if (item) { - $('#ClassNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1" } - }); - } else { - $('#ClassNo').lrselectRefresh({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" } - }); - } - } - }); - $('#ClassNo').lrselect({ - allowSearch: true, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', - param: { strWhere: "1=1 AND CheckMark=1" }, - value: "classno", - text: "classname" - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 打印 - $('#lr_print').on('click', function () { - $('#gridtable').jqprintTable(); - }); - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/FormView?keyValue=' + keyValue, - width: 800, - height: 600, - btn: null - }); - } - }); - - //完善资助信息 - $("#lr_supply").on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '完善信息', - url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/IsHelpForm?keyValue=' + keyValue, - width: 600, - height: 450, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - - }); - - - }, - // 初始化列表 - initGird: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetPageList', - headData: [ - { label: "姓名", name: "StuName", width: 100, align: "left" }, - { - label: "班级", name: "ClassNo", width: 150, 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: "ResidenceType", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'HouseholdCategory', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "享受等级", name: "SupportGrade", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'SupportGrade', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "资助种类(一等)", name: "SupportType", width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getsAsync('dataItem', { - key: value, - code: 'SupportType1', - callback: function (text) { - callback(text); - } - }); - } - }, - { - label: "资助种类(二等)", name: "SupportType1", width: 200, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getsAsync('dataItem', { - key: value, - code: 'SupportType2', - callback: function (text) { - callback(text); - } - }); - } - - }, - //{ - // label: "资助种类", name: "SupportType", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'SupportType1', - // callback: function (_data) { - // if (_data.text) { - // callback(_data.text); - // } else { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'SupportType2', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - // } - // }); - // } - //}, - { label: "符合资助条件", name: "SupportCondition", width: 200, align: "left" }, - { label: "创建时间", name: "SupportTime", width: 200, align: "left" }, - { label: "操作人", name: "SupportUserName", width: 100, align: "left" }, - { label: "备注信息", name: "SupportRemarks", width: 200, align: "left" } - ], - //isMultiselect: true, - mainId: 'StuId', - isPage: true, - sord: 'desc', - sidx: 'SupportTime' - }); - page.search(); - }, - refreshMoney: function () { - var deptNo = $("#DeptNo").lrselectGet(); - var majorNo = $("#MajorNo").lrselectGet(); - var classNo = $("#ClassNo").lrselectGet(); - $.post( - top.$.rootUrl + '/EducationalAdministration/StuEnroll/GetHelpStatistics', - { - DeptNo: deptNo, - MajorNo: majorNo, - ClassNo: classNo - }, - function (res) { - $("#allAmount").html(res.data.aa); - $("#isAmount").html(res.data.bb); - }, "json"); - }, - search: function (param) { - param = param || {}; - param.SqlParameter = ' AND IsReport=1 AND IsSupport=1'; - param.Grade = "20"; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - }, - - }; - refreshGirdData = function () { - page.search(); - }; - page.init(); -} 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 332fd8b2b..510589233 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 @@ -324,6 +324,7 @@ + @@ -1002,7 +1003,6 @@ - @@ -7381,7 +7381,6 @@ -