From 848c625aca6cdae7135d7df934bbf570f58dfa20 Mon Sep 17 00:00:00 2001 From: liangkun Date: Sat, 3 Sep 2022 18:29:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=20?= =?UTF-8?q?=E6=96=B0=E7=94=9F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoFresh/PayFeeIndex.js | 6 ++++++ .../Learun.Application.Web/Views/UserCenter/Index.cshtml | 2 +- .../Learun.Application.WebApi/XmlConfig/database.config | 1 + .../StuInfoFresh/StuInfoFreshEntity.cs | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) 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..e668ea2ca 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 @@ -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 @@ + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs index af2d3a7f8..c6eecc1d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshEntity.cs @@ -627,7 +627,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 是否开票 /// [Column("ISINVOICE")] - public int? IsInvoice { get; set; } + public bool? IsInvoice { get; set; } /// /// 人脸核验结果 /// From f28035fb6b145b1ac6f22e6b2d330e55bb88b4ed Mon Sep 17 00:00:00 2001 From: liangkun Date: Mon, 5 Sep 2022 12:26:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A5=BF=E6=98=8Capp2.0=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index ce761b07a..bc5568d8a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -21,10 +21,10 @@ export default { // "http://192.168.2.98:8088/" // ], "apiHost": [ - "http://192.168.10.58:8012/" + "http://192.168.10.68:8002/" // "http://123.57.209.16:31173/" ], - "webHost":"http://demo.bjquanjiang.com:8081/", + "webHost":"http://192.168.10.68:8001/", // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026 420528200507261428 From a5859a5af8a2114f78634e2f91f4fe5cf02c339b Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 6 Sep 2022 11:33:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic_PayFee/PayFeeForm.js | 4 +++- .../Views/StuInfoBasic_PayFee/PayFeeIndex.js | 2 +- .../Views/StuInfoFresh/PayFeeForm.js | 4 +++- .../Views/StuInfoFresh/PayFeeIndex.js | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) 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 e668ea2ca..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; } }