diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index 2b16551e5..7a7ed688d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -665,7 +665,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers FinaChargesStandardList = FinaChargesStandardList, StuInfoFreshFamilyList = stuInfoFreshFamily, PayFeeTotal = PayFeeTotal, - YJAmount = FeeOrderList.Sum(x => x.SJAmount) + YJAmount = FinaChargesStandardList.Sum(x => x.PayedMoney) }; return Success(jsonData); } @@ -1321,9 +1321,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers if (!string.IsNullOrEmpty(imgUrl)) { - // model.PayFeeDetail = entity.PayFeeDetail; - // model.PayMoney = entity.PayMoney; - model.LoanMoney = entity.LoanMoney; model.orderid = orderid; stuInfoFreshIBLL.SaveFeeData(keyValue, model, list); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js index 100439d5d..60badd6ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_PayFee/InvoiceForm.js @@ -5,7 +5,7 @@ * 描 述：新生缴费管理 */ var acceptClick; -var keyValue = '0003FFA0-23B8-4345-A020-E0DCBD2535EB';// request('keyValue'); +var keyValue = request('keyValue'); var bootstrap = function ($, learun) { "use strict"; var page = { @@ -16,7 +16,7 @@ var bootstrap = function ($, learun) { }, bind: function () { $('#lr_form_tabs').lrFormTab(); - $('#lr_form_tabs ul li').eq(0).trigger('click'); + //$('#lr_form_tabs ul li').eq(0).trigger('click'); //取消缴费 $('#cancelPayFee').click(function () { @@ -33,11 +33,12 @@ var bootstrap = function ($, learun) { for (var i = 0; i < res.data.length; i++) { ulHtml += '
  • 票据' + (i + 1) + '
    • '; contentHtml += '
    '; - contentHtml += ''; + contentHtml += ''; contentHtml += '
    '; } $('#tabul').html(ulHtml); $('#lr_tab_content').html(contentHtml); + $('#lr_form_tabs ul li').eq(0).trigger('click'); } else { learun.alert.warning("当前新生尚未开具发票，请缴费成功后耐心等待！"); return; 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 5b3bcea2d..b60c0fd5b 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,6 +115,7 @@ 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()); @@ -142,8 +143,6 @@ var bootstrap = function ($, learun) { param.PayMoney = $('#PayMoney').html(); learun.loading(true, '正在生成付款信息请稍等...'); $("#confirmPayFee").hide(); - console.log(JSON.stringify(param)); - console.log(JSON.stringify(list)); learun.httpAsyncPost(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/PayFeeQRCode?keyValue=' + keyValue, { strEntity: JSON.stringify(param), detailList: JSON.stringify(list) }, function (res) { learun.loading(false); $('#qrcodeImg').attr('src', res.info); 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 a9d23e2bc..d81f978cf 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 @@ -52,7 +52,7 @@ var bootstrap = function ($, learun) { title: '二维码缴费', url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/PayFeeForm?keyValue=' + keyValue, width: 800, - height: 650, + height: 690, btn: null }); } @@ -74,7 +74,7 @@ var bootstrap = function ($, learun) { title: '查看发票', url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_PayFee/InvoiceForm?keyValue=' + keyValue, width: 1000, - height: 600, + height: 800, btn: null }); //learun.layerForm({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js index d6bc2708f..10950587f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/InvoiceForm.js @@ -32,7 +32,7 @@ var bootstrap = function ($, learun) { for (var i = 0; i < res.data.length; i++) { ulHtml += '
  • 票据' + (i + 1) + '
    • '; contentHtml += '
    '; - contentHtml += ''; + contentHtml += ''; contentHtml += '
    '; } $('#tabul').html(ulHtml); 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 b2e933427..94fcac8ec 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 @@ -102,7 +102,7 @@ var bootstrap = function ($, learun) { $.each(data['FinaChargesStandardList'], function (i, item) { html += '' + item.ChargeItemName + '' + item.Standard + '元'; }); - html += '应缴合计' + data['PayFeeTotal'] + '元'; + html += '应缴合计' + data['PayFeeTotal'] + '元' + PayFeeTotal+''; html += '  '; html += '已缴金额' + YJAmount + ''; $('#PayFeeDetail').html(html); @@ -114,6 +114,7 @@ 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()); 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 3ce4239e8..d2e3bcadf 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 @@ -53,7 +53,7 @@ var bootstrap = function ($, learun) { title: '二维码缴费', url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/PayFeeForm?keyValue=' + keyValue, width: 800, - height: 650, + height: 690, btn: null }); } @@ -73,7 +73,7 @@ var bootstrap = function ($, learun) { title: '查看发票', url: top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/InvoiceForm?keyValue=' + keyValue, width: 1000, - height: 600, + height: 800, btn: null }); //learun.layerForm({ @@ -302,8 +302,14 @@ var bootstrap = function ($, learun) { { label: '学号', name: 'StuNo', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 100, align: "left" }, { - label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatter: function (value) { - return value == 1 ? "已缴费" : "未缴费"; + label: '线上缴费状态', name: 'PayFeeStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'PayStatus', + callback: function (_data) { + callback(_data.text); + } + }); } }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml new file mode 100644 index 000000000..0b058ccca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Properties/PublishProfiles/FolderProfile6.pubxml @@ -0,0 +1,18 @@ + + + + + FileSystem + FileSystem + Release + Any CPU + + True + False + bin\Release\Publish + True + + \ No newline at end of file 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 e072cc0d8..067e4e9a1 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 @@ -15,14 +15,14 @@
    @@ -687,7 +687,7 @@
    @if (ViewBag.UserType == "学生") { -
    + @*

    西昌民族幼儿师范高等专科学校

    @@ -711,7 +711,7 @@ 3、选择课只开放三天，三天后自动关闭选课功能，每门选修课记2个选修学分，如果修不够选修学分将会无法毕业。

    -
    +
    *@ } @if (ViewBag.UserType == "学生" || ViewBag.UserType == "教师") @@ -743,8 +743,8 @@ $("#headUrl").attr("src", "/LR_OrganizationModule/User/GetImg?userId=" + loginInfo.userId); if ('@ViewBag.UserType' == '学生') { - $("#lr_left_list").children('li').eq(4).addClass("active"); - $('.lr-layout-wrap-item').eq(5).addClass("active"); + $("#lr_left_list").children('li').eq(0).addClass("active"); + $('.lr-layout-wrap-item').eq(0).addClass("active"); } else { $("#lr_left_list").children('li').eq(0).addClass("active");