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 482532ff9..e3f6fd188 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 @@ -29,11 +29,14 @@ return false; } if (entity.PayFeeStatus != "1" && entity.StudentLoanStatus != "1" && entity.OnsitePayFeeStatus != "1") { - learun.layer.loading(false); - learun.layer.confirm('新生未缴费,无法报到!', function (_index) { - learun.nav.closeCurrent(); - }, '智慧校园提示', ['确定']); - return false; + if(!entity.StudentLoanBLStatus) + { + learun.layer.loading(false); + learun.layer.confirm('新生未缴费且未设置贷款状态,无法报到!', function (_index) { + learun.nav.closeCurrent(); + }, '智慧校园提示', ['确定']); + return false; + } } //学生 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 f5690ea47..1e4ad60e8 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 @@ -45,6 +45,7 @@ learun.layer.toast('保存成功'); setTimeout(function () { learun.nav.closeCurrent(); + learun.nav.go({ path: '/EducationalAdministration/StuInfoFresh/RegisterQRCode', title: '生成报到二维码', isBack: true, isHead: true, param: {}, type: 'right' }); }, 2000); } }); @@ -53,7 +54,6 @@ }, bind: function ($page) { - console.log($page.find('#StudentLoanBLStatus')); $page.find('#StudentLoanBLStatus').lrpickerex({ code: 'StudentLoanBLStatus', type:'dataItem'