diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html index 8f396bdf1..366b2d5bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/StudentLoan/StudentLoan.html @@ -1,13 +1,14 @@
-
+
办理贷款状态 +
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 1e65f3625..f5690ea47 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 @@ -5,12 +5,12 @@ //数据绑定 learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "StuInfoFresh/stuInfoFresh", {}, (data) => { - console.log(data); if (data) { for (var id in data) { if (id == "StuInfoFreshEntity") { $page.find("#ID").val(data[id].ID); - $page.find("#StudentLoan").val(data[id].StudentLoan); + $page.find("#StudentLoanBLStatus").lrpickerSet(data[id].StudentLoanBLStatus); + //$page.find("#StudentLoan").val(data[id].StudentLoan); if (data[id].StudentLoanStatus == "1") { learun.layer.loading(false); learun.layer.confirm('新生助学贷款已审核！', function (_index) { @@ -29,14 +29,15 @@ $page.find('#saveBtn').on('tap', function () { var postdata = { ID: $('#ID').val(), - StudentLoan: $('#StudentLoan').val(), + // StudentLoan: $('#StudentLoan').val(), + StudentLoan: '', StudentLoanStatus: "0", - StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet() + StudentLoanBLStatus:$("#StudentLoanBLStatus").lrpickerGet() }; - if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { - postdata.StudentLoanStatus = "1"; - } - if ($('#StudentLoanBLStatus').lrselectGet().trim() != null && $('#StudentLoanBLStatus').lrselectGet().trim() != "" && $('#StudentLoanBLStatus').lrselectGet().trim() != undefined) { + // if ($('#StudentLoan').val().trim() != null && $('#StudentLoan').val().trim() != "" && $('#StudentLoan').val().trim() != undefined) { + // postdata.StudentLoanStatus = "1"; + // } + if ($('#StudentLoanBLStatus').lrpickerGet().trim() != null && $('#StudentLoanBLStatus').lrpickerGet().trim() != "" && $('#StudentLoanBLStatus').lrpickerGet().trim() != undefined) { postdata.StudentLoanBLStatus = "2"; } learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => { 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 38d75aa25..927576b07 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 @@ -3,7 +3,7 @@
-
2020
+
2021
新生入校流程
@@ -32,7 +32,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 d89cc5377..b0e8a2b96 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,7 +24,7 @@ } else { notCompleteStyle("#PayFeeStatus", "images/enter2-2.png"); } - if (data["StuInfoFreshEntity"].StudentLoanStatus == "1") { + if (data["StuInfoFreshEntity"].StudentLoanBLStatus) { completeStyle("#StudentLoan", "images/enter1-3.png"); } else { notCompleteStyle("#StudentLoan", "images/enter2-3.png"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index c0c4fb108..d5b69f515 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -25,9 +25,11 @@ @* 缴费*@  线上缴费  取消线上缴费 -  填写贷款回执码 -  审核助学贷款 -  去审核助学贷款 + @* 填写贷款回执码*@ + @* 审核助学贷款 +  去审核助学贷款*@ +  已办理贷款 +  正在办理贷款  现场缴费  其他费用缴费  取消其他费用缴费 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 d4fc9c4a8..38fd0164e 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 @@ -115,16 +115,23 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.StudentLoanStatus == "1") { - learun.alert.warning("当前新生助学贷款已审核！"); - return; - } - if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) { - learun.alert.warning("贷款回执码为空！"); - return; - } + //if (selectedRow.StudentLoanStatus == "1") { + // learun.alert.warning("当前新生助学贷款已审核！"); + // return; + //} + //if (selectedRow.StudentLoan == null || selectedRow.StudentLoan == "" || selectedRow.StudentLoan == undefined) { + // learun.alert.warning("贷款回执码为空！"); + // return; + //} - learun.layerConfirm('是否确认审核助学贷款！', function (res) { + //learun.layerConfirm('是否确认审核助学贷款！', function (res) { + // if (res) { + // learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () { + // refreshGirdData(); + // }); + // } + //}); + learun.layerConfirm('是否确认已办理贷款！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 1 }, function () { refreshGirdData(); @@ -138,13 +145,20 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('ID'); selectedRow = $('#gridtable').jfGridGet('rowdata'); if (learun.checkrow(keyValue)) { - if (selectedRow.StudentLoanStatus != "1") { - learun.alert.warning("当前新生助学贷款未审核！"); - return; - } - learun.layerConfirm('是否确认去审核助学贷款！', function (res) { + //if (selectedRow.StudentLoanStatus != "1") { + // learun.alert.warning("当前新生助学贷款未审核！"); + // return; + //} + //learun.layerConfirm('是否确认去审核助学贷款！', function (res) { + // if (res) { + // learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () { + // refreshGirdData(); + // }); + // } + //}); + learun.layerConfirm('是否确认正在办理贷款！', function (res) { if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 0 }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/DoCheckLoan', { keyValue: keyValue, status: 2 }, function () { refreshGirdData(); }); } @@ -231,12 +245,12 @@ var bootstrap = function ($, learun) { }); } }, - { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, - { - label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { - return value == 1 ? "已审核" : "未审核"; - } - }, + //{ 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.Application.WebApi/Modules/StuInfoFreshApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs index 40e75f9a5..9da19806b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -202,7 +202,7 @@ namespace Learun.Application.WebApi.Modules var entity = stuInfoFreshIBLL.GetStuInfoFreshEntity(model.ID); entity.StudentLoan = model.StudentLoan; entity.StudentLoanStatus = model.StudentLoanStatus; - + entity.StudentLoanBLStatus = model.StudentLoanBLStatus; stuInfoFreshIBLL.SaveEntity(entity.ID, entity); return Success("保存成功"); 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 6109d2d1d..0ea7d038e 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 @@ -1148,13 +1148,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - if (status == "1")//通过 + //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 + "' "); + //} + if (status == "1")//已办理 { - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='1' where ID='" + keyValue + "' "); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='1' where ID='" + keyValue + "' "); } else { - this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanStatus='0' where ID='" + keyValue + "' "); + this.BaseRepository("CollegeMIS").ExecuteBySql("update StuInfoFresh set StudentLoanBLStatus='2' where ID='" + keyValue + "' "); } } catch (Exception ex)