From 9218faa6ef45f337ea29b76c10833ac0fbd002c9 Mon Sep 17 00:00:00 2001 From: liangkun Date: Tue, 24 Aug 2021 18:15:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E7=94=9F=E6=A8=A1=E5=9D=97=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterQRCode/RegisterQRCode.html | 6 ++++-- .../StuInfoFresh/RegisterQRCode/RegisterQRCode.js | 6 ++++-- .../StuInfoFresh/StudentLoan/StudentLoan.html | 8 +++++++- .../StuInfoFresh/StudentLoan/StudentLoan.js | 14 +++++++++++--- .../www/pages/notice2/notice2.html | 6 +++--- .../www/pages/notice2/notice2.js | 10 +++++----- .../www/pages/welcome/welcome.html | 2 +- .../Views/StuInfoFresh/PayFeeIndex.js | 11 +++++++++++ .../Modules/StuInfoFreshApi.cs | 6 +++++- .../StuInfoFresh/StuInfoFreshEntity.cs | 6 ++++++ 10 files changed, 57 insertions(+), 18 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html index b46fee571..e3d11fd70 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/EducationalAdministration/StuInfoFresh/RegisterQRCode/RegisterQRCode.html @@ -17,11 +17,13 @@
专业
班级
教室
+
学号
+
寝室号
-
+
辅导员姓名
辅导员电话
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 555a73aad..482532ff9 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 @@ -42,9 +42,11 @@ $('.sQrList strong').eq(2).html(data.StuInfoFreshEntity.MajorNo); $('.sQrList strong').eq(3).html(data.StuInfoFreshEntity.ClassNo); $('.sQrList strong').eq(4).html(data.StuInfoFreshEntity.DefaultClassRoomName); + $('.sQrList strong').eq(5).html(data.StuInfoFreshEntity.StuNo); + $('.sQrList strong').eq(6).html(data.StuInfoFreshEntity.DormitoryName); //班主任 - $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); - $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); + // $('.sQrText span').eq(0).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); + // $('.sQrText span').eq(1).html(data.StuInfoFreshEntity.ClassDiredctorMobile); //辅导员 $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassTutorName != null ? data.StuInfoFreshEntity.ClassTutorName.slice(0, 1) + "老师" : ""); $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassTutorMobile); 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 48b742e7c..1bc1d21c8 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,11 +1,17 @@ -
+
贷款回执码 + 办理贷款状态 +
+
+ 办理贷款状态 +
+
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 a07fb1e1d..2a79d2269 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 @@ -1,4 +1,4 @@ -(function () { +(function () { var page = { isScroll: false, init: function ($page) { @@ -29,11 +29,15 @@ var postdata = { ID: $('#ID').val(), StudentLoan: $('#StudentLoan').val(), - StudentLoanStatus: "0" + StudentLoanStatus: "0", + StudentLoanBLStatus:$("#StudentLoanBLStatus").lrselectGet(); }; 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) { + postdata.StudentLoanBLStatus = "2"; + } learun.httpget(config.webapi + "StuInfoFresh/saveLoan", postdata, (data) => { if (data) { learun.layer.toast('保存成功'); @@ -47,7 +51,11 @@ }, bind: function ($page) { - + $page.find('#StudentLoanBLStatus').lrselect({ + type: 'StudentLoanBLStatus', + needPre:false + }); + } }; 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 c46ad1698..38d75aa25 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 @@ -24,7 +24,7 @@
线上缴费 - ( 已缴费、未缴费 ) + (地址：http://onlinepay.xcmzyz.com/)
未完成
@@ -36,14 +36,14 @@
未完成
-
+
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 ec11bc7c0..d89cc5377 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 @@ -29,11 +29,11 @@ } else { notCompleteStyle("#StudentLoan", "images/enter2-3.png"); } - if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { - completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); - } else { - notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); - } + // if (data["StuInfoFreshEntity"].OnsitePayFeeStatus == "1") { + // completeStyle("#OnsitePayFeeStatus", "images/enter1-4.png"); + // } else { + // notCompleteStyle("#OnsitePayFeeStatus", "images/enter2-4.png"); + // } if (data["StuInfoFreshEntity"].RegisterStatus == "1") { completeStyle("#RegisterStatus", "images/enter1-5.png"); } else { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html index 3d4ca9fe2..ae54c78b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html @@ -102,7 +102,7 @@
联系电话 - +
紧急联系人
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 c77612a65..d4fc9c4a8 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 @@ -220,6 +220,17 @@ var bootstrap = function ($, learun) { } }, { label: '线上缴费时间', name: 'PayFeeDate', width: 130, align: "left" }, + { + label: '办理贷款状态', name: 'StudentLoanBLStatus', width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StudentLoanBLStatus', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, { label: '贷款回执码', name: 'StudentLoan', width: 130, align: "left" }, { label: '助学贷款状态', name: 'StudentLoanStatus', width: 100, align: "left", formatter: function (value) { 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 37e2fb22e..40e75f9a5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/StuInfoFreshApi.cs @@ -382,7 +382,11 @@ namespace Learun.Application.WebApi.Modules /// /// 贷款回执码状态 /// - public string StudentLoanStatus { get; set; } + public string StudentLoanStatus { get; set; } + /// + /// 办理贷款状态 + /// + public string StudentLoanBLStatus { get; set; } /// /// 家庭成员 /// 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 9353504ca..01055cb7a 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 @@ -507,6 +507,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("STUDENTLOAN")] public string StudentLoan { get; set; } /// + /// 助学贷款：办理贷款状态 + /// + /// + [Column("STUDENTLOANBLSTATUS")] + public string StudentLoanBLStatus { get; set; } + /// /// 助学贷款状态：1已审核0未审核 /// ///