From d5bc1ccc3ba077c112889aaa43b3eca932685528 Mon Sep 17 00:00:00 2001 From: edy Date: Wed, 8 Sep 2021 14:09:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=BC=B4=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RegisterQRCode/RegisterQRCode.js | 8 ++-- .../www/pages/notice/notice.html | 4 +- .../www/pages/notice/notice.js | 4 +- .../Controllers/StuInfoFreshController.cs | 9 +++- .../Views/StuInfoFresh/PayFeeIndex.cshtml | 4 +- .../Views/StuInfoFresh/PayFeeIndex.js | 15 +++++- .../XmlConfig/database.config | 2 + .../StuInfoFresh/StuInfoFreshBLL.cs | 25 ++++++++++ .../StuInfoFresh/StuInfoFreshIBLL.cs | 7 +++ .../StuInfoFresh/StuInfoFreshService.cs | 46 ++++++++++++++++++- 10 files changed, 112 insertions(+), 12 deletions(-) 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 e3f6fd188..9f396dc54 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 @@ -12,6 +12,10 @@ learun.layer.loading(true, '获取数据中'); learun.httpget(config.webapi + "StuInfoFresh/stuInfoFreshEntity", userinfo.baseinfo.account, (data) => { if (data) { + //辅导员 + $('.sQrText span').eq(2).html(data.StuInfoFreshEntity.ClassDiredctorName != null ? data.StuInfoFreshEntity.ClassDiredctorName.slice(0, 1) + "老师" : ""); + $('.sQrText span').eq(3).html(data.StuInfoFreshEntity.ClassDiredctorMobile); + //判断是否显示报到二维码：未确认报到，且已完善信息，且缴费三有一； var entity = data["StuInfoFreshEntity"]; if (entity.RegisterStatus == "1") { @@ -50,9 +54,7 @@ //班主任 // $('.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); + //二维码 learun.code.encode({ id: 'lr_mycode_qrcode', text: data.StuInfoFreshEntity.StuNo }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html index 0299d65aa..02ef97191 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.html @@ -21,10 +21,10 @@ 班级：
- 辅导员： + 辅导员：
- 电话： + 电话：
宿舍： diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js index c989d93cd..9574e05a9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/notice/notice.js @@ -16,8 +16,8 @@ $('#DeptNo').html(entity.DeptNo); $('#MajorNo').html(entity.MajorNo); $('#ClassNo').html(entity.ClassNo); - $('#ClassTutorName').html(entity.ClassTutorName); - $('#ClassTutorMobile').html(entity.ClassTutorMobile); + $('#ClassDiredctorName').html(entity.ClassDiredctorName); + $('#ClassDiredctorMobile').html(entity.ClassDiredctorMobile); $('#PayFeeStatus').html(entity.PayFeeStatus == "1" ? "已缴费" : "未缴费"); $('#CollectFileStatus').html(entity.CollectFileStatus == "1" ? "已提交" : "未提交"); $('#GetKeyStatus').html(entity.GetKeyStatus == "1" ? "已领取" : "未领取"); 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 c1f64a959..593a5d8b6 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 @@ -55,7 +55,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View("Index"); } - + [HttpGet] public ActionResult IndexDC() { @@ -286,6 +286,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers #region 获取数据 + [HttpPost] + [AjaxOnly] + public void SynchronousList() + { + stuInfoFreshIBLL.SynchronousList(); + } + /// /// 获取列表数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml index d5b69f515..54c4b777e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.cshtml @@ -11,6 +11,7 @@
+
 查询 @@ -21,13 +22,14 @@
+  同步  查看 @* 缴费*@  线上缴费  取消线上缴费 @* 填写贷款回执码*@ @* 审核助学贷款 -  去审核助学贷款*@ +  去审核助学贷款*@  已办理贷款  正在办理贷款  现场缴费 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 38fd0164e..7b12b1be7 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 @@ -17,7 +17,8 @@ var bootstrap = function ($, learun) { // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); + var Grade = $('#Grade').val(); + page.search({ keyword: keyword, Grade: Grade }); }); // 刷新 $('#lr_refresh').on('click', function () { @@ -200,6 +201,18 @@ var bootstrap = function ($, learun) { }); } }); + //同步数据 + $('#lr_synchronous').on('click', + function () { + learun.layerConfirm('是否要同步缴费数据！',function (res) { + if (res) { + learun.postForm( + top.$.rootUrl + '/EducationalAdministration/StuInfoFresh/SynchronousList', {}, function () { + refreshGirdData(); + }); + } + }); + }); // 取消其他费用缴费 $('#lr_cancelOtherPay').on('click', function () { var keyValue = $('#gridtable').jfGridValue('ID'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 489b3b61f..ca0d018a1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -19,6 +19,8 @@ + +