edy
3 lat temu
4 zmienionych plików z 1 dodań i 331 usunięć
-
+0 -9Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
-
+0 -69Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml
-
+0 -251Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js
-
+1 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
+ 0
- 9
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuEnrollController.cs
Wyświetl plik
| @@ -205,15 +205,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||
| return View(); | |||
| } | |||
| /// <summary> | |||
| /// 是否资助(教师) | |||
| /// </summary> | |||
| /// <returns></returns> | |||
| [HttpGet] | |||
| public ActionResult Teacher() | |||
| { | |||
| return View(); | |||
| } | |||
| /// <summary> | |||
| /// 完善资助信息 | |||
| /// </summary> | |||
| /// <returns></returns> | |||
+ 0
- 69
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.cshtml
Wyświetl plik
| @@ -1,69 +0,0 @@ | |||
| @{ | |||
| ViewBag.Title = "新生资助管理"; | |||
| Layout = "~/Views/Shared/_Index.cshtml"; | |||
| } | |||
| <div class="lr-layout "> | |||
| <div class="lr-layout-center"> | |||
| <div class="lr-layout-wrap lr-layout-wrap-notitle "> | |||
| <div class="lr-layout-tool"> | |||
| <div class="lr-layout-tool-left"> | |||
| <div class="lr-layout-tool-item"> | |||
| <div id="multiple_condition_query"> | |||
| <div class="lr-query-formcontent"> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">系</div> | |||
| <div id="DeptNo"></div> | |||
| </div> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">专业</div> | |||
| <div id="MajorNo"></div> | |||
| </div> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">班级</div> | |||
| <div id="ClassNo"></div> | |||
| </div> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">学年</div> | |||
| <div id="Year"></div> | |||
| </div> | |||
| @*<div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">是否资助</div> | |||
| <div id="IsSubsidize1"></div> | |||
| </div>*@ | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">身份证</div> | |||
| <input id="IDCard" type="text" class="form-control" /> | |||
| </div> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">姓名</div> | |||
| <input id="StuName" type="text" class="form-control" /> | |||
| </div> | |||
| <div class="col-xs-12 lr-form-item"> | |||
| <div class="lr-form-item-title">报名号</div> | |||
| <input id="RegistrationNo" type="text" class="form-control" /> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| <div class="lr-layout-tool-right"> | |||
| @*<div class=" btn-group btn-group-sm"> | |||
| <span>资助</span><span id="allAmount"></span> | |||
| <span>不资助</span><span id="isAmount"></span> | |||
| </div>*@ | |||
| <div class=" btn-group btn-group-sm"> | |||
| <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a> | |||
| </div> | |||
| <div class=" btn-group btn-group-sm" learun-authorize="yes"> | |||
| <a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i> 查看</a> | |||
| <a id="lr_supply" class="btn btn-default"><i class="fa fa-plus"></i> 完善资助信息</a> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| <div class="lr-layout-body" id="gridtable"></div> | |||
| </div> | |||
| </div> | |||
| </div> | |||
| @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js") | |||
+ 0
- 251
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnroll/Teacher.js
Wyświetl plik
| @@ -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(); | |||
| } | |||
+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
Wyświetl plik
| @@ -324,6 +324,7 @@ | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\EvaHygieveController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\EvaViolationOfDisciplineController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\LeaveSchoolAController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\LR_Base_LogoController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\PracticeBaseController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterBuildingController.cs" /> | |||
| <Compile Include="Areas\EducationalAdministration\Controllers\R_EnterSchoolController.cs" /> | |||
| @@ -1002,7 +1003,6 @@ | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\AmountForm.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\HelpChange.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IndexHelpChange.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\Teacher.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\IsHelpForm.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\StuTuition.js" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\Peichart.js" /> | |||
| @@ -7381,7 +7381,6 @@ | |||
| <Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData.cshtml" /> | |||
| <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\IndexView.cshtml" /> | |||
| <Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\FormView.cshtml" /> | |||
| <Content Include="Areas\EducationalAdministration\Views\StuEnroll\Teacher.cshtml" /> | |||
| <None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> | |||
| <Content Include="Views\Login\Default-beifen.cshtml" /> | |||
| <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" /> | |||