ソースを参照

【修改】新生缴费管理:增加助学贷款审核功能;移动端:根据助学贷款状态进行显示;

中职版本
dyy 4年前
コミット
7f10b48447
12個のファイルの変更112行の追加7行の削除
  1. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/PayFee.js
  2. +3
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.css
  3. +5
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/PayFee/form/form.js
  4. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.js
  5. +7
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html
  7. +4
    -4
      Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.js
  8. +13
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs
  9. +15
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js
  10. +24
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshBLL.cs
  11. +7
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshIBLL.cs
  12. +31
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs

+ 1
- 0
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($('<p class="lr-ellipsis"><span>贷款回执码:</span></p>').dataFormatter({ value: _item.StudentLoan }));
_$item.append($('<p class="lr-ellipsis"><span>助学贷款状态:</span></p>').dataFormatter({ value: _item.StudentLoanStatus == "1" ? "已审核" : "未审核" }));
_$item.append($('<p class="lr-ellipsis"><span>现场缴费状态:</span></p>').dataFormatter({
value: _item.OnsitePayFeeStatus,
type: 'dataItem',


+ 3
- 0
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;
}

+ 5
- 0
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);


+ 1
- 1
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();


+ 7
- 0
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);


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice2/notice2.html ファイルの表示

@@ -34,7 +34,7 @@
助学贷款
<span>( 填写贷款回执码 )</span>
</div>
<div class="sSec1State">完成</div>
<div class="sSec1State">完成</div>
</div>
<div class="sSec1Con sSec1Type2" id="OnsitePayFeeStatus">
<img src="images/enter2-4.png" alt="">


+ 4
- 4
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('未完成');


+ 13
- 0
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("操作成功");
}

/// <summary>
///审核助学贷款
/// </summary>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult DoCheckLoan(string keyValue, string status)
{
stuInfoFreshIBLL.DoCheckLoan(keyValue, status);
return Success("操作成功");
}

/// <summary>
/// 获取新生缴费明细
/// <summary>


+ 15
- 1
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 ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-warning\">未审核</span>";
}
},
{
label: '现场缴费状态', name: 'OnsitePayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {


+ 24
- 0
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
}
}

/// <summary>
/// 审核助学贷款
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
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);
}
}
}

/// <summary>
/// 分配班级
/// <param name="keyValue">主键</param>


+ 7
- 0
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
/// <returns></returns>
void IsOtherPayFee(string keyValue, string status);

/// <summary>
/// 审核助学贷款
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
void DoCheckLoan(string keyValue, string status);

/// <summary>
/// 分配班级
/// <param name="keyValue">主键</param>


+ 31
- 0
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
}
}

/// <summary>
/// 审核助学贷款
/// <param name="keyValue">主键</param>
/// <summary>
/// <returns></returns>
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);
}
}
}

/// <summary>
/// 分配班级
/// <param name="keyValue">主键</param>


読み込み中…
キャンセル
保存