From eb2f89e9ba27ee6395c31b66d08f07957d6c51c8 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 15 Jul 2022 17:03:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BD=95=E5=8F=96=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=8F=96=E6=B6=88=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuEnrollPhone/Search.cshtml | 6 +- .../Views/StuEnrollPhone/SearchResult.cshtml | 75 +++++-------------- .../StuEnroll/StuEnrollService.cs | 3 +- 3 files changed, 23 insertions(+), 61 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml index e9d7b9069..68a3ad432 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml @@ -37,10 +37,10 @@ * 身份证号 -
+ @*
* 手机号 -
+
*@
提交
@@ -63,7 +63,7 @@ form.on('submit(*)', function (data) { //var strEntity = JSON.stringify(data.field); - location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val() + '&StuMobile=' + $('#StuMobile').val(); + location.href = '/EducationalAdministration/StuEnrollPhone/SearchResult?type=' + type + '&StuName=' + encodeURI(encodeURI($('#StuName').val())) + '&IDCard=' + $('#IDCard').val(); //$.ajax({ // url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, // data: { strEntity: strEntity }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml index 1bf8c5658..007780cbf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml @@ -17,7 +17,7 @@ - +
@@ -36,28 +36,24 @@ * 身份证号
-
+ @*
* 手机号 -
+
*@
* 考试信息
- - - - - - - - - +
* 是否录取
+
+
+ 录取成功，请手机截屏，保存结果图片，报名时出示此图片！ +
@*
提交
*@ @@ -78,62 +74,26 @@ var type = request('type'); var StuName = request('StuName'); var IDCard = request('IDCard'); - var StuMobile = request('StuMobile'); + //var StuMobile = request('StuMobile'); layui.use(['form', 'laydate', 'upload'], function () { var form = layui.form; - //按钮点击 - //form.on('submit(*)', function (data) { - // var strEntity = JSON.stringify(data.field); - - // $.ajax({ - // url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, - // data: { strEntity: strEntity }, - // type: "GET", - // dataType: "json", - // async: true, - // cache: false, - // success: function (data) { - // if (data.code == 200) { - // alert("报名成功，请等待考试通知！"); - // } else { - // alert(data.info); - // } - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // }, - // beforeSend: function () { - // }, - // complete: function () { - // } - // }); - // return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。 - - //}); - //var laydate = layui.laydate; - - //时间选择 - //laydate.render({ - // elem: '#Birthday', - // min: today.y + '-' + today.m + '-' + today.d - //}); }); $(window).load(function () { + $('#admmsg').hide(); if (type == '1') { //查询考试地点及时间 $('#locdiv').show(); - //$('#timediv').show(); $('#admdiv').hide();; } else { $('#admdiv').show(); $('#locdiv').hide(); - //$('#timediv').hide(); } //查询 $.ajax({ url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, - data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: StuMobile }, + data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: "" }, type: "GET", dataType: "json", async: true, @@ -144,13 +104,17 @@ if (data.StuEnroll) { $('#StuName').val(decodeURI(StuName)); $('#IDCard').val(IDCard); - $('#StuMobile').val(StuMobile); + // $('#StuMobile').val(StuMobile); //$('#ExamLocation').val(data.StuEnroll.ExamLocation); //if (data.StuEnroll.ExamStartTime) { // $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime); //} if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) { $('#IsAdmission').val('是'); + if (type == '2') { + //查询录取结果 + $('#admmsg').show(); + } } else { $('#IsAdmission').val('否'); } @@ -173,15 +137,14 @@ html += ''; html += ''; html += '
'; - + } } $('#examDiv').html(html); - } + } } else { alert(data.info); location.href = '/EducationalAdministration/StuEnrollPhone/Search?type=' + type; - } }, error: function (XMLHttpRequest, textStatus, errorThrown) { @@ -191,7 +154,7 @@ complete: function () { } }); - + renderForm() }) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs index 16373fcaf..0e7796fb1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs @@ -1997,8 +1997,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindEntity(x => x.EnrollStatus == 2 && - x.StuName == entity.StuName && x.StuMobile == entity.StuMobile && x.IDCard == entity.IDCard); + return this.BaseRepository("CollegeMIS").FindEntity(x => x.EnrollStatus == 2 && x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard); } catch (Exception ex) {