bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

【修改】校级奖学金完善；

新疆体育高职分支
dyy 1 year ago
parent
1451084e95
commit
2b33f6170f
8 changed files with 375 additions and 312 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +36
    -28
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml
  2. +23
    -220
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js
  3. +21
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml
  4. +177
    -20
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js
  5. +0
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml
  6. +8
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js
  7. +95
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs
  8. +15
    -30
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs

+ 36
- 28
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.cshtml View File

@@ -5,28 +5,36 @@
<div class="lr-form-wrap" id="form"> <div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">姓名<font face="宋体">*</font></div> <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
<input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly style="width: 91%;float: left;" />
<a id="lr_select" class="btn btn-primary" style="float: left; margin-left: 8px;">选择</a>
<input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly style="width: 90%;float: left;" />
<a id="lr_select" class="btn btn-primary" style="float: left; margin-left: 8px;padding:3px 6px;">选择</a>
</div> </div>
<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">学号<font face="宋体">*</font></div> <div class="lr-form-item-title">学号<font face="宋体">*</font></div>
<input id="StuNo" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" /> <input id="StuNo" type="text" class="form-control" readonly isvalid="yes" checkexpession="NotNull" />
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">所属院系<font face="宋体">*</font></div>
<div id="DeptNo" isvalid="yes" checkexpession="NotNull" readonly></div>
<div class="lr-form-item-title">所属院系</div>
<div id="DeptNo" readonly></div>
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">所属班级<font face="宋体">*</font></div>
<div id="ClassNo" isvalid="yes" checkexpession="NotNull" readonly></div>
<div class="lr-form-item-title">所属班级</div>
<div id="ClassNo" readonly></div>
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div> <div class="lr-form-item-title">身份证件类型<font face="宋体">*</font></div>
<input id="IdCardType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
<div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">身份证件号</div>
<input id="IdCard" type="text" class="form-control" readonly />
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">学年</div>
<input id="AcademicYearNo" type="text" class="form-control" readonly />
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">身份证件号<font face="宋体">*</font></div>
<input id="IdCard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
<div class="lr-form-item-title">学期</div>
<input id="Semester" type="text" class="form-control" readonly />
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">班级总人数<font face="宋体">*</font></div> <div class="lr-form-item-title">班级总人数<font face="宋体">*</font></div>
@@ -36,6 +44,18 @@
<div class="lr-form-item-title">成绩排名名次<font face="宋体">*</font></div> <div class="lr-form-item-title">成绩排名名次<font face="宋体">*</font></div>
<input id="ClassRank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly /> <input id="ClassRank" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
</div> </div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户银行</div>
<div id="DepositBank" readonly></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户行账号</div>
<input id="BankCard" type="text" class="form-control" readonly />
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户行号</div>
<input id="BankCode" type="text" class="form-control" value="20230307230" />
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">资助等级<font face="宋体">*</font></div> <div class="lr-form-item-title">资助等级<font face="宋体">*</font></div>
<div id="FundingLevel" isvalid="yes" checkexpession="NotNull"></div> <div id="FundingLevel" isvalid="yes" checkexpession="NotNull"></div>
@@ -62,27 +82,15 @@
</div> </div>
<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">申请理由<font face="宋体">*</font></div> <div class="lr-form-item-title">申请理由<font face="宋体">*</font></div>
<textarea id="ApplyAccount" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户银行<font face="宋体">*</font></div>
<div id="DepositBank" isvalid="yes" checkexpession="NotNull" readonly></div>
</div>
<div class="col-xs-6 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户行账号<font face="宋体">*</font></div>
<input id="BankCard" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
</div>
<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">开户行号</div>
<input id="BankCode" type="text" class="form-control" />
<textarea id="ApplyAccount" class="form-control" style="height:50px;" isvalid="yes" checkexpession="NotNull"></textarea>
</div> </div>
<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship"> <div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship">
<div class="lr-form-item-title">备注</div> <div class="lr-form-item-title">备注</div>
<textarea id="Remark" class="form-control" style="height:100px;"></textarea>
<textarea id="Remark" class="form-control" style="height: 50px;" isvalid="yes" checkexpession="LenStrOrNull" length="100" placeholder="字符长度最多为100位"></textarea>
</div>
<div class="col-xs-12 lr-form-item" id="FilesDiv">
<div class="lr-form-item-title">附件</div>
<div id="Url"></div>
</div> </div>
@*<div class="col-xs-12 lr-form-item" data-table="SchoolLevelScholarship" >
<div class="lr-form-item-title">附件上传</div>
<div id="Url" ></div>
</div>*@
</div> </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js") @Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js")

+ 23
- 220
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Form.js View File

@@ -7,20 +7,35 @@
var acceptClick; var acceptClick;
var bindData; var bindData;
var keyValue = request('keyValue'); var keyValue = request('keyValue');
var Step = request('Step');//第几步
var bootstrap = function ($, learun) { var bootstrap = function ($, learun) {
"use strict"; "use strict";
var page = { var page = {
init: function () { init: function () {
$('.lr-form-wrap').lrscroll(); $('.lr-form-wrap').lrscroll();
page.hide();
page.bind(); page.bind();
page.initData(); page.initData();
}, },
hide: function () {
if (Step == "2") {//第二步：二级学院审核，时附件显示且必填；
$('#FilesDiv').show();
$('#Url').attr('isvalid', 'yes');
$('#Url').attr('checkexpession', 'NotNull');
$('#Url').prev().html('附件<font face="宋体">*</font>');
} else {
$('#Url').removeAttr('isvalid');
$('#Url').removeAttr('checkexpession');
$('#Url').prev().html('附件');
$('#FilesDiv').hide();
}
},
bind: function () { bind: function () {
$('#DepositBank').lrDataItemSelect({
code: 'DepositBank'
});
$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
$('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
$('#IdCardType').lrselectSet("01");
$('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
$('#FundingLevel').lrDataItemSelect({ $('#FundingLevel').lrDataItemSelect({
code: 'SchoolFundingLevel', code: 'SchoolFundingLevel',
select: function (item) { select: function (item) {
@@ -32,7 +47,7 @@ var bootstrap = function ($, learun) {
} }
}); });
$('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')); $('#ApplyDate').val(learun.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'));
//$('#Url').lrUploader();
$('#Url').lrUploader();
//选择学生 //选择学生
$("#lr_select").on('click', function () { $("#lr_select").on('click', function () {
learun.layerForm({ learun.layerForm({
@@ -46,219 +61,6 @@ var bootstrap = function ($, learun) {
} }
}); });
}); });
//$("#StuName").lrlayerselect({
// treeUrl: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetClassList',
// treeParentId: 'ClassNo',
// treeValueId: 'ClassNo',
// treeTextId: 'ClassName',
// dataUrl: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetStuList',
// dataTreeId: 'ClassNo',
// dataValueId: 'StuNo',
// dataTextId: 'StuName',
// grid: [
// { label: "学号", name: "StuNo", width: 100, align: "left" },
// //{ label: "学籍号", name: "StuCode", width: 100, align: "left" },
// //{ label: "考生号", name: "ksh", width: 100, align: "left" },
// //{ label: "通知书号", name: "NoticeNo", 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" },
// { 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: 'BCdPartyFace',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
// },
// {
// 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: "Grade", width: 100, align: "left" },
// {
// 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: "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: "EntranceDate", 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: "Domicile", width: 100, align: "left" },
// {
// label: "户口分类", name: "ResidenceNo", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'ResidenceNo',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
// },
// {
// label: "籍贯 (省)", name: "F_ProvinceId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_PROVINCE',
// key: value,
// keyId: 'pcode',
// callback: function (_data) {
// callback(_data['pname']);
// }
// });
// }
// },
// {
// label: "籍贯 (市)", name: "F_CityId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_CITY',
// key: value,
// keyId: 'ccode',
// callback: function (_data) {
// callback(_data['cname']);
// }
// });
// }
// },
// {
// label: "籍贯 (县)", name: "F_CountyId", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'DIC_AREA',
// key: value,
// keyId: 'acode',
// callback: function (_data) {
// callback(_data['aname']);
// }
// });
// }
// },
// { label: "备注", name: "Remark", width: 200, align: "center" },
// {
// label: "异动状态", name: "MoveStatus", width: 80, align: "center",
// formatter: function (cellvalue) {
// return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
// }
// },
// {
// label: "异动类型", name: "MoveType", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'StuChangeType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
// },
// {
// label: "审核状态", name: "CheckMark", width: 80, align: "center",
// formatter: function (cellvalue) {
// return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
// }
// }
// ],
// select: function (values, texts) {
// if (values && values.length > 0) {
// console.log('values', values);
// $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetStuInfoBasicEntityByStuNo?keyValue=' + values[0], function (data) {
// data = data.StuInfoBasic;
// console.log(data);
// $('#StuNo').val(data.StuNo);
// $('#DeptNo').lrselectSet(data.DeptNo);
// $('#ClassNo').val(data.ClassNo);
// $('#IdCard').val(data.IdCard);
// $('#IdCardType').val('居民身份证');
// $('#BankCard').val(data.BankCard);
// $('#BankCode').val(data.BankCode);
// });
// }
// },
// unknowselect: function () {
// },
// isMultiple: false
//});
}, },
initData: function () { initData: function () {
if (!!keyValue) { if (!!keyValue) {
@@ -297,11 +99,12 @@ var bootstrap = function ($, learun) {
$('#DeptNo').lrselectSet(data.DeptNo); $('#DeptNo').lrselectSet(data.DeptNo);
$('#ClassNo').lrselectSet(data.ClassNo); $('#ClassNo').lrselectSet(data.ClassNo);
$('#IdCard').val(data.IdCard); $('#IdCard').val(data.IdCard);
$('#IdCardType').val('居民身份证');
$('#DepositBank').lrselectSet(data.DepositBank);
$('#BankCard').val(data.BankCard);
$('#AcademicYearNo').val(data.AcademicYearNo);
$('#Semester').val(data.Semester);
$('#CalssNum').val(data.StuNum); $('#CalssNum').val(data.StuNum);
$('#ClassRank').val(data.Num); $('#ClassRank').val(data.Num);
$('#DepositBank').lrselectSet(data.DepositBank);
$('#BankCard').val(data.BankCard);
} }
}; };
page.init(); page.init();


+ 21
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.cshtml View File

@@ -2,21 +2,35 @@
ViewBag.Title = "校级奖学金"; ViewBag.Title = "校级奖学金";
Layout = "~/Views/Shared/_Index.cshtml"; Layout = "~/Views/Shared/_Index.cshtml";
} }
<style>
.datesearchLabel {
float: left;
line-height: 28px;
height: 40px;
padding-top: 13px;
padding-left: 5px;
}

.datesearchLabel:first-child {
padding-left: 0px;
}
</style>
<div class="lr-layout " > <div class="lr-layout " >
<div class="lr-layout-center"> <div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle "> <div class="lr-layout-wrap lr-layout-wrap-notitle ">
<div class="lr-layout-tool"> <div class="lr-layout-tool">
<div class="lr-layout-tool-left"> <div class="lr-layout-tool-left">
<div class="datesearchLabel">申请</div>
<div class="lr-layout-tool-item">
<div id="datesearch"></div>
</div>
<div class="datesearchLabel">发放</div>
<div class="lr-layout-tool-item">
<div id="datesearchRelease"></div>
</div>
<div class="lr-layout-tool-item"> <div class="lr-layout-tool-item">
<div id="multiple_condition_query"> <div id="multiple_condition_query">
<div class="lr-query-formcontent"> <div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">申请日期</div>
<div id="ApplyDate"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">发放日期</div>
</div>
<div class="col-xs-12 lr-form-item"> <div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">所属院系</div> <div class="lr-form-item-title">所属院系</div>
<div id="DeptNo"></div> <div id="DeptNo"></div>
@@ -49,7 +63,6 @@
<a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a> <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
<a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a> <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a> <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
</div> </div>
</div> </div>
</div> </div>


+ 177
- 20
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/Index.js View File

@@ -7,15 +7,71 @@
var refreshGirdData; var refreshGirdData;
var bootstrap = function ($, learun) { var bootstrap = function ($, learun) {
"use strict"; "use strict";
var startTime;
var endTime;
var startTimeRelease;
var endTimeRelease;
var page = { var page = {
init: function () { init: function () {
page.initGird(); page.initGird();
page.bind(); page.bind();
}, },
bind: function () { bind: function () {
$('#datesearch').lrdate({
dfdata: [
{ name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
],
// 月
mShow: false,
premShow: false,
// 季度
jShow: false,
prejShow: false,
// 年
ysShow: false,
yxShow: false,
preyShow: false,
yShow: false,
// 默认
dfvalue: '1',
selectfn: function (begin, end) {
startTime = begin;
endTime = end;
page.search();
}
});
$('#datesearchRelease').lrdate({
dfdata: [
{ name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
{ name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
],
// 月
mShow: false,
premShow: false,
// 季度
jShow: false,
prejShow: false,
// 年
ysShow: false,
yxShow: false,
preyShow: false,
yShow: false,
// 默认
dfvalue: '1',
selectfn: function (begin, end) {
startTimeRelease = begin;
endTimeRelease = end;
page.search();
}
});
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson); page.search(queryJson);
}, 350, 400);
}, 250, 400);
$('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' }); $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo',value: 'deptno',text: 'deptname' });
$('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
$('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' }); $('#FundingLevel').lrDataItemSelect({ code: 'StateStipend' });
@@ -29,8 +85,8 @@ var bootstrap = function ($, learun) {
id: 'form', id: 'form',
title: '新增', title: '新增',
url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form', url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form',
width: 850,
height: 650,
width: 1100,
height: 700,
callBack: function (id) { callBack: function (id) {
return top[id].acceptClick(refreshGirdData); return top[id].acceptClick(refreshGirdData);
} }
@@ -40,12 +96,17 @@ var bootstrap = function ($, learun) {
$('#lr_edit').on('click', function () { $('#lr_edit').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id'); var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) { if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != "0") {
learun.alert.warning("当前项不属于草稿状态，无法编辑！");
return false;
}
learun.layerForm({ learun.layerForm({
id: 'form', id: 'form',
title: '编辑', title: '编辑',
url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?keyValue=' + keyValue, url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/Form?keyValue=' + keyValue,
width: 850,
height: 650,
width: 1100,
height: 700,
callBack: function (id) { callBack: function (id) {
return top[id].acceptClick(refreshGirdData); return top[id].acceptClick(refreshGirdData);
} }
@@ -56,6 +117,11 @@ var bootstrap = function ($, learun) {
$('#lr_delete').on('click', function () { $('#lr_delete').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('Id'); var keyValue = $('#gridtable').jfGridValue('Id');
if (learun.checkrow(keyValue)) { if (learun.checkrow(keyValue)) {
var Status = $('#gridtable').jfGridValue('Status');
if (Status != "0") {
learun.alert.warning("当前项不属于草稿状态，无法删除！");
return false;
}
learun.layerConfirm('是否确认删除该项！', function (res) { learun.layerConfirm('是否确认删除该项！', function (res) {
if (res) { if (res) {
learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DeleteForm', { keyValue: keyValue}, function () { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/DeleteForm', { keyValue: keyValue}, function () {
@@ -65,14 +131,11 @@ var bootstrap = function ($, learun) {
}); });
} }
}); });
// 打印
$('#lr_print').on('click', function () {
$('#gridtable').jqprintTable();
});

}, },
// 初始化列表 // 初始化列表
initGird: function () { initGird: function () {
$('#gridtable').lrAuthorizeJfGrid({
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList', url: top.$.rootUrl + '/EducationalAdministration/SchoolLevelScholarship/GetPageList',
headData: [ headData: [
{ label: "学号", name: "StuNo", width: 100, align: "left"}, { label: "学号", name: "StuNo", width: 100, align: "left"},
@@ -99,8 +162,21 @@ var bootstrap = function ($, learun) {
} }
}); });
}}, }},
{ label: "身份证件类型", name: "IdCardType", width: 100, align: "left"},
{
label: "身份证件类型", name: "IdCardType", width: 100, align: "left"
, formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'IdCardType',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: "身份证件号", name: "IdCard", width: 100, align: "left"}, { label: "身份证件号", name: "IdCard", width: 100, align: "left"},
{ label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
{ label: "学期", name: "Semester", width: 100, align: "left" },
{ label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"}, { label: "成绩排名总人数", name: "CalssNum", width: 100, align: "left"},
{ label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"}, { label: "成绩排名名次", name: "ClassRank", width: 100, align: "left"},
{ label: "资助等级", name: "FundingLevel", width: 100, align: "left", { label: "资助等级", name: "FundingLevel", width: 100, align: "left",
@@ -116,27 +192,108 @@ var bootstrap = function ($, learun) {
{ label: "资助标准", name: "FundingCriteria", width: 100, align: "left"}, { label: "资助标准", name: "FundingCriteria", width: 100, align: "left"},
{ label: "应发金额", name: "ShoudAmount", width: 100, align: "left"}, { label: "应发金额", name: "ShoudAmount", width: 100, align: "left"},
{ label: "实发金额", name: "ActualAmount", width: 100, align: "left"}, { label: "实发金额", name: "ActualAmount", width: 100, align: "left"},
{ label: "申请日期", name: "ApplyDate", width: 100, align: "left"},
{ label: "发放日期", name: "ProvideDate", width: 100, align: "left"},
{
label: "申请日期", name: "ApplyDate", width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: "发放日期", name: "ProvideDate", width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{ label: "申请理由", name: "ApplyAccount", width: 100, align: "left"}, { label: "申请理由", name: "ApplyAccount", width: 100, align: "left"},
{ label: "开户银行", name: "DepositBank", width: 100, align: "left"},
{
label: "开户银行", name: "DepositBank", width: 100, align: "left"
, formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'DepositBank',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{ label: "开户行账号", name: "BankCard", width: 100, align: "left"}, { label: "开户行账号", name: "BankCard", width: 100, align: "left"},
{ label: "开户行号", name: "BankCode", width: 100, align: "left"}, { label: "开户行号", name: "BankCode", width: 100, align: "left"},
{ label: "备注", name: "Remark", width: 100, align: "left"},
{ label: "附件上传", name: "Url", width: 100, align: "left"},
{ label: "备注说明", name: "Remark", width: 100, align: "left" },
{
label: '审核状态', name: 'Status', width: 100, align: "left", formatter: function (cellvalue) {
return cellvalue == "0" ? "<span class=\"label label-default\">草稿</span>" : cellvalue == "1" ? "<span class=\"label label-success\">学院审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">学工部审核中</span>" : cellvalue == "3" ? "<span class=\"label label-success\">已归档</span>" : "<span class=\"label label-default\">草稿</span>";
}
},
{
label: '创建人', name: 'CreateUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{ label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
{ label: '提交时间', name: 'SubmitTime', width: 130, align: "left" },
{
label: '提交人', name: 'SubmitUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{
label: '学院审核人', name: 'FirstCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{ label: '学院审核时间', name: 'FirstCheckTime', width: 130, align: "left" },
{
label: '学工部审核人', name: 'SecondCheckUserId', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{ label: '学工部审核时间', name: 'SecondCheckTime', width: 130, align: "left" },
], ],
mainId:'Id', mainId:'Id',
isPage: true
isPage: true,
sidx: 'CreateTime desc'
}); });
page.search();
}, },
search: function (param) { search: function (param) {
param = param || {}; param = param || {};
$('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
param.StartTime = startTime;
param.EndTime = endTime;
param.StartTimeRelease = startTimeRelease;
param.EndTimeRelease = endTimeRelease;
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
} }
}; };
refreshGirdData = function () { refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
page.search();
}; };
page.init(); page.init();
} }

+ 0
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.cshtml View File

@@ -112,4 +112,3 @@
</div> </div>
</div> </div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js") @Html.AppendJsFile("/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js")
<script src="~/Content/static/js/LodopFuncs.js"></script>

+ 8
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolLevelScholarship/IndexInStuScore.js View File

@@ -186,16 +186,19 @@ var bootstrap = function ($, learun) {
// 保存数据 // 保存数据
acceptClick = function (callBack) { acceptClick = function (callBack) {
var row = $('#gridtable').jfGridGet('rowdata'); var row = $('#gridtable').jfGridGet('rowdata');
if ($.isEmptyObject(row)) {
learun.alert.warning("请选择学生！");
return false;
}

row.AcademicYearNo = $('#AcademicYearNo').lrselectGet();
row.Semester = $('#Semester').lrselectGet();


//var box = $('.perFestivalsBox').find('div.box.active');
//if (box.length <= 0) {
// learun.alert.warning("请选择学生！");
// return false;
//}
if (!!callBack) { if (!!callBack) {
callBack(row); callBack(row);
return true; return true;
} }
}; };
page.init(); page.init();
} }

+ 95
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipEntity.cs View File

@@ -119,6 +119,94 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary> /// </summary>
[Column("URL")] [Column("URL")]
public string Url { get; set; } public string Url { get; set; }
/// <summary>
/// 学年
/// </summary>
[Column("ACADEMICYEARNO")]
public string AcademicYearNo { get; set; }
/// <summary>
/// 学期
/// </summary>
[Column("SEMESTER")]
public string Semester { get; set; }
/// <summary>
/// 0 草稿 1 二级学院 2 学工部 3 归档
/// </summary>
/// <returns></returns>
[Column("STATUS")]
public string Status { get; set; }
/// <summary>
/// 创建人
/// </summary>
/// <returns></returns>
[Column("CREATEUSERID")]
public string CreateUserId { get; set; }
/// <summary>
/// 创建人
/// </summary>
/// <returns></returns>
[Column("CREATEUSERNO")]
public string CreateUserNo { get; set; }
/// <summary>
/// 创建时间
/// </summary>
/// <returns></returns>
[Column("CREATETIME")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 编辑人
/// </summary>
/// <returns></returns>
[Column("MODIFYUSERID")]
public string ModifyUserId { get; set; }
/// <summary>
/// 编辑人
/// </summary>
/// <returns></returns>
[Column("MODIFYUSERNO")]
public string ModifyUserNo { get; set; }
/// <summary>
/// 编辑时间
/// </summary>
/// <returns></returns>
[Column("MODIFYTIME")]
public DateTime? ModifyTime { get; set; }
/// <summary>
/// 提交时间
/// </summary>
/// <returns></returns>
[Column("SUBMITTIME")]
public DateTime? SubmitTime { get; set; }
/// <summary>
/// 提交人
/// </summary>
/// <returns></returns>
[Column("SUBMITUSERID")]
public string SubmitUserId { get; set; }
/// <summary>
/// 学院审核人
/// </summary>
/// <returns></returns>
[Column("FIRSTCHECKUSERID")]
public string FirstCheckUserId { get; set; }
/// <summary>
/// 学院审核时间
/// </summary>
/// <returns></returns>
[Column("FIRSTCHECKTIME")]
public DateTime? FirstCheckTime { get; set; }
/// <summary>
/// 学工部审核人
/// </summary>
/// <returns></returns>
[Column("SECONDCHECKUSERID")]
public string SecondCheckUserId { get; set; }
/// <summary>
/// 学工部审核时间
/// </summary>
/// <returns></returns>
[Column("SECONDCHECKTIME")]
public DateTime? SecondCheckTime { get; set; }
#endregion #endregion


#region 扩展操作 #region 扩展操作
@@ -128,6 +216,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Create() public void Create()
{ {
this.Id = Guid.NewGuid().ToString(); this.Id = Guid.NewGuid().ToString();
this.CreateTime = DateTime.Now;
this.CreateUserId = LoginUserInfo.Get().userId;
this.CreateUserNo = LoginUserInfo.Get().account;
this.Status = "0";//草稿
} }
/// <summary> /// <summary>
/// 编辑调用 /// 编辑调用
@@ -136,6 +228,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Modify(string keyValue) public void Modify(string keyValue)
{ {
this.Id = keyValue; this.Id = keyValue;
this.ModifyTime = DateTime.Now;
this.ModifyUserId = LoginUserInfo.Get().userId;
this.ModifyUserNo = LoginUserInfo.Get().account;
} }
#endregion #endregion
#region 扩展字段 #region 扩展字段


+ 15
- 30
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolLevelScholarship/SchoolLevelScholarshipService.cs View File

@@ -30,44 +30,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try try
{ {
var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append(@"
t.Id,
t.StuNo,
t.StuName,
t.DeptNo,
t.ClassNo,
t.IdCardType,
t.IdCard,
t.CalssNum,
t.ClassRank,
t.FundingLevel,
t.FundingCriteria,
t.ShoudAmount,
t.ActualAmount,
t.ApplyDate,
t.ProvideDate,
t.ApplyAccount,
t.DepositBank,
t.BankCard,
t.BankCode,
t.Remark,
t.Url
");
strSql.Append("SELECT t.* ");
strSql.Append(" FROM SchoolLevelScholarship t "); strSql.Append(" FROM SchoolLevelScholarship t ");
strSql.Append(" left join StuInfoBasic s on t.StuNo=s.StuNo ");
strSql.Append(" WHERE 1=1 "); strSql.Append(" WHERE 1=1 ");
var queryParam = queryJson.ToJObject(); var queryParam = queryJson.ToJObject();
// 虚拟参数 // 虚拟参数
var dp = new DynamicParameters(new { }); var dp = new DynamicParameters(new { });
if (!queryParam["ApplyDate"].IsEmpty())
if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
{ {
dp.Add("ApplyDate",queryParam["ApplyDate"].ToString(), DbType.String);
strSql.Append(" AND t.ApplyDate = @ApplyDate ");
dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.ApplyDate >= @startTime AND t.ApplyDate <= @endTime ) ");
} }
if (!queryParam["ProvideDate"].IsEmpty())
if (!queryParam["StartTimeRelease"].IsEmpty() && !queryParam["EndTimeRelease"].IsEmpty())
{ {
dp.Add("ProvideDate",queryParam["ProvideDate"].ToString(), DbType.String);
strSql.Append(" AND t.ProvideDate = @ProvideDate ");
dp.Add("StartTimeRelease", queryParam["StartTimeRelease"].ToDate(), DbType.DateTime);
dp.Add("EndTimeRelease", queryParam["EndTimeRelease"].ToDate(), DbType.DateTime);
strSql.Append(" AND ( t.ProvideDate >= @StartTimeRelease AND t.ProvideDate <= @EndTimeRelease ) ");
}
if (!queryParam["StuNo"].IsEmpty())
{
dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
strSql.Append(" AND t.StuNo Like @StuNo ");
} }
if (!queryParam["DeptNo"].IsEmpty()) if (!queryParam["DeptNo"].IsEmpty())
{ {


Write Preview
Loading…
Cancel
Save