diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js index b60c0fd5b..e5bae24d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeForm.js @@ -115,7 +115,6 @@ var bootstrap = function ($, learun) { var detail = ""; var ifisnull = false; $('.paydetail').each(function (i, item) { - $(this).attr('disabled', 'disabled'); var value = 0; if (!!$(this).val()) { value = parseFloat($(this).val()); @@ -136,6 +135,9 @@ var bootstrap = function ($, learun) { learun.alert.warning("收费项目金额不能为空!请检查并填写。"); return; } + $('.paydetail').each(function(i, item) { + $(this).attr('disabled', 'disabled'); + }); detail = detail.substring(0, detail.length - 1); var param = {}; //param.LoanMoney = $('#LoanMoney').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js index d81f978cf..ca2dc16d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/PayFeeIndex.js @@ -91,7 +91,7 @@ var bootstrap = function ($, learun) { } }); } else { - learun.alert.warning("当前学生尚未缴费,请缴费成功后耐心等待!"); + learun.alert.warning("当前学生尚未开票,请缴费成功后耐心等待!"); return; } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js index d396a2f12..520e7021a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeForm.js @@ -114,7 +114,6 @@ var bootstrap = function ($, learun) { var detail = ""; var ifisnull = false; $('.paydetail').each(function (i, item) { - $(this).attr('disabled', 'disabled'); var value = 0; if (!!$(this).val()) { value = parseFloat($(this).val()); @@ -135,6 +134,9 @@ var bootstrap = function ($, learun) { learun.alert.warning("收费项目金额不能为空!请检查并填写。"); return; } + $('.paydetail').each(function(i, item) { + $(this).attr('disabled', 'disabled'); + }); detail = detail.substring(0, detail.length - 1); var param = {}; //param.LoanMoney = $('#LoanMoney').val(); 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 d2e3bcadf..8c3c68bc3 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 @@ -90,7 +90,7 @@ var bootstrap = function ($, learun) { } }); } else { - learun.alert.warning("当前新生尚未缴费,请缴费成功后耐心等待!"); + learun.alert.warning("当前学生尚未开票,请缴费成功后耐心等待!"); return; } } @@ -312,6 +312,12 @@ var bootstrap = function ($, learun) { }); } }, + { + label: "开票状态", name: "IsInvoice", width: 80, align: "center", + formatter: function (cellvalue) { + return cellvalue === true ? "已开票" : "未开票"; + } + }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, { label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml index 5e7b5a3eb..76cc01d0b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/Index.cshtml @@ -725,7 +725,7 @@ {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config index dcdf1b76c..7662181b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/database.config @@ -28,4 +28,5 @@