diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js index a4de19d43..27f07365d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js @@ -104,6 +104,7 @@ dateformat: 'yyyy-MM-dd hh:mm:ss' })); _$item.append($('

贷款回执码:

').dataFormatter({ value: _item.StudentLoan })); + _$item.append($('

助学贷款状态:

').dataFormatter({ value: _item.StudentLoanStatus == "1" ? "已审核" : "未审核" })); _$item.append($('

现场缴费状态:

').dataFormatter({ value: _item.OnsitePayFeeStatus, type: 'dataItem', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css index c3b2cd671..8d07c01f1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css @@ -5,3 +5,6 @@ .lr-form-row label { width: 100px; } +#StudentLoan[readonly='readonly']{ + background-color:#eee; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js index c3bb87180..05c2b3162 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js @@ -123,6 +123,11 @@ else { $page.find('[data-table="' + id + '"]').lrformSet(data[id]); } + if (data[id].StudentLoanStatus == "1") { + $page.find("#StudentLoan").attr("readonly", "readonly"); + } else { + $page.find("#StudentLoan").removeAttr("readonly"); + } } } learun.layer.loading(false); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js index 5a4329fe8..143c62d77 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js @@ -28,7 +28,7 @@ }, '智慧校园提示', ['确定']); return false; } - if (entity.PayFeeStatus != "1" && (entity.StudentLoan == null || entity.StudentLoan == "" || entity.StudentLoan == undefined) && entity.OnsitePayFeeStatus != "1") { + if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") { learun.layer.loading(false); learun.layer.confirm('新生未缴费,无法报到!', function (_index) { learun.nav.closeCurrent(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js index 69f9b8bdd..ac2289a21 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js @@ -10,6 +10,13 @@ if (id == "StuInfoFreshEntity") { $page.find("#ID").val(data[id].ID); $page.find("#StudentLoan").val(data[id].StudentLoan); + if (data[id].StudentLoanStatus == "1") { + learun.layer.loading(false); + learun.layer.confirm('新生助学贷款已审核!', function (_index) { + learun.nav.closeCurrent(); + }, '智慧校园提示', ['确定']); + return false; + } } } page.bind($page); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html index a95e33e7f..a4bfb785e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html @@ -34,7 +34,7 @@ 助学贷款 ( 填写贷款回执码 ) -
已完成
+
未完成
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js index 14e654b11..ec11bc7c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js @@ -24,10 +24,10 @@ } else { notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); } - if (data["StuInfoFreshEntity"].StudentLoan == null || data["StuInfoFreshEntity"].StudentLoan == "" || data["StuInfoFreshEntity"].StudentLoan == undefined) { - notCompleteStyle("#StudentLoan", "images/enter2-3.png"); - } else { + if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") { completeStyle("#StudentLoan", "images/enter1-3.png"); + } else { + notCompleteStyle("#StudentLoan", "images/enter2-3.png"); } if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); @@ -67,7 +67,7 @@ $(box).find(".sSec1State").html('已完成'); $(box).find('img').attr("src", img); }; - //已完成样式 + //未完成样式 var notCompleteStyle = function (box, img) { $(box).removeClass("sSec1Type1").addClass("sSec1Type2"); $(box).find(".sSec1State").html('未完成'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 2593a693c..a798f7167 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -566,6 +566,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuInfoFreshIBLL.IsOtherPayFee(keyValue, status); return Success("操作成功"); } + + /// + ///审核助学贷款 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoCheckLoan(string keyValue, string status) + { + stuInfoFreshIBLL.DoCheckLoan(keyValue, status); + return Success("操作成功"); + } + /// /// 获取新生缴费明细 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index 9d8302b67..5f61b0722 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -89,11 +89,15 @@ var bootstrap = function ($, learun) { }); } }); - // 助学贷款 + // 填写贷款回执码 $('#lr_loan').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { + if (selectedRow.StudentLoanStatus == "1") { + learun.alert.warning("当前新生助学贷款已审核!"); + return; + } learun.layerForm({ id: 'loanForm', title: '助学贷款', @@ -115,6 +119,11 @@ var bootstrap = function ($, learun) { learun.alert.warning("当前新生助学贷款已审核!"); return; } + if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) { + learun.alert.warning("贷款回执码为空!"); + return; + } + learun.layerConfirm('是否确认审核助学贷款!', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () { @@ -212,6 +221,11 @@ var bootstrap = function ($, learun) { }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, + { + label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { + return value == 1 ? "已审核" : "未审核"; + } + }, { label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { learun.clientdata.getAsync('dataItem', { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs index ff3406b37..44e2c1b3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs @@ -580,6 +580,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 审核助学贷款 + /// 主键 + /// + /// + public void DoCheckLoan(string keyValue, string status) + { + try + { + stuInfoFreshService.DoCheckLoan(keyValue, status); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 分配班级 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs index b8b582b8d..8c61dddef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs @@ -162,6 +162,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void IsOtherPayFee(string keyValue, string status); + /// + /// 审核助学贷款 + /// 主键 + /// + /// + void DoCheckLoan(string keyValue, string status); + /// /// 分配班级 /// 主键 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 3bc31adc9..bdee91610 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -1079,6 +1079,37 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 审核助学贷款 + /// 主键 + /// + /// + public void DoCheckLoan(string keyValue, string status) + { + try + { + if (status == "1")//通过 + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' "); + } + else + { + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' "); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 分配班级 /// 主键