bjquanjiang
/
DigitalScholl
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

新疆影视学院高职
ndbs 2 years ago
parent
e989b7cd42 8c184b112e
commit
c205e58771
3 changed files with 23 additions and 61 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml
  2. +19
    -56
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml
  3. +1
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs

+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/Search.cshtml View File

@@ -37,10 +37,10 @@
<span class="chickInputLable"><span>*</span> 身份证号</span> <span class="chickInputLable"><span>*</span> 身份证号</span>
<input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input"> <input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
</div> </div>
<div class="chickInput">
@*<div class="chickInput">
<span class="chickInputLable"><span>*</span> 手机号</span> <span class="chickInputLable"><span>*</span> 手机号</span>
<input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input"> <input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input">
</div>
</div>*@
</div> </div>
<!-- / chickForm_sec1 --> <!-- / chickForm_sec1 -->
<div class="chickBtn" lay-submit lay-filter="*">提交</div> <div class="chickBtn" lay-submit lay-filter="*">提交</div>
@@ -63,7 +63,7 @@
form.on('submit(*)', function (data) { form.on('submit(*)', function (data) {
//var strEntity = JSON.stringify(data.field); //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({ //$.ajax({
// url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, // url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
// data: { strEntity: strEntity }, // data: { strEntity: strEntity },


+ 19
- 56
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuEnrollPhone/SearchResult.cshtml View File

@@ -17,7 +17,7 @@
<link href="~/Content/css/common.css" rel="stylesheet" /> <link href="~/Content/css/common.css" rel="stylesheet" />
<link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" /> <link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
<link href="~/Content/css/fromAdd.css" rel="stylesheet" /> <link href="~/Content/css/fromAdd.css" rel="stylesheet" />
</head> </head>
<body> <body>
<div class="warpper" id="app"> <div class="warpper" id="app">
@@ -36,28 +36,24 @@
<span class="chickInputLable"><span>*</span> 身份证号</span> <span class="chickInputLable"><span>*</span> 身份证号</span>
<input type="text" id="IDCard" name="IDCard" class="layui-input" readonly="readonly"> <input type="text" id="IDCard" name="IDCard" class="layui-input" readonly="readonly">
</div> </div>
<div class="chickInput">
@*<div class="chickInput">
<span class="chickInputLable"><span>*</span> 手机号</span> <span class="chickInputLable"><span>*</span> 手机号</span>
<input type="text" id="StuMobile" name="StuMobile" class="layui-input" readonly="readonly"> <input type="text" id="StuMobile" name="StuMobile" class="layui-input" readonly="readonly">
</div>
</div>*@
<div class="chickInput" id="locdiv"> <div class="chickInput" id="locdiv">
<span class="chickInputLable"><span>*</span> 考试信息</span> <span class="chickInputLable"><span>*</span> 考试信息</span>
<div id="examDiv" readonly="readonly" style="font-size: 12px;"> <div id="examDiv" readonly="readonly" style="font-size: 12px;">

</div> </div>
</div> </div>
<div class="chickInput" id="admdiv"> <div class="chickInput" id="admdiv">
<span class="chickInputLable"><span>*</span> 是否录取</span> <span class="chickInputLable"><span>*</span> 是否录取</span>
<input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly"> <input type="text" id="IsAdmission" name="IsAdmission" readonly="readonly">
</div> </div>
<div id="admmsg">
<div id="fileDownLoad"></div>
<span style="font-size: 12px; color: red;" id="msg">录取成功，请手机截屏，保存结果图片，报名时出示此图片！</span>
</div>
</div> </div>
<!-- / chickForm_sec1 --> <!-- / chickForm_sec1 -->
@*<div class="chickBtn" lay-submit lay-filter="*">提交</div>*@ @*<div class="chickBtn" lay-submit lay-filter="*">提交</div>*@
@@ -78,62 +74,26 @@
var type = request('type'); var type = request('type');
var StuName = request('StuName'); var StuName = request('StuName');
var IDCard = request('IDCard'); var IDCard = request('IDCard');
var StuMobile = request('StuMobile');
//var StuMobile = request('StuMobile');
layui.use(['form', 'laydate', 'upload'], function () { layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form; 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 () { $(window).load(function () {
$('#admmsg').hide();
if (type == '1') { if (type == '1') {
//查询考试地点及时间 //查询考试地点及时间
$('#locdiv').show(); $('#locdiv').show();
//$('#timediv').show();
$('#admdiv').hide();; $('#admdiv').hide();;
} else { } else {
$('#admdiv').show(); $('#admdiv').show();
$('#locdiv').hide(); $('#locdiv').hide();
//$('#timediv').hide();
} }
//查询 //查询
$.ajax({ $.ajax({
url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type, url: '/EducationalAdministration/StuEnrollPhone/SearchForm?type=' + type,
data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: StuMobile },
data: { StuName: decodeURI(StuName), IDCard: IDCard, StuMobile: "" },
type: "GET", type: "GET",
dataType: "json", dataType: "json",
async: true, async: true,
@@ -144,13 +104,17 @@
if (data.StuEnroll) { if (data.StuEnroll) {
$('#StuName').val(decodeURI(StuName)); $('#StuName').val(decodeURI(StuName));
$('#IDCard').val(IDCard); $('#IDCard').val(IDCard);
$('#StuMobile').val(StuMobile);
// $('#StuMobile').val(StuMobile);
//$('#ExamLocation').val(data.StuEnroll.ExamLocation); //$('#ExamLocation').val(data.StuEnroll.ExamLocation);
//if (data.StuEnroll.ExamStartTime) { //if (data.StuEnroll.ExamStartTime) {
// $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime); // $('#ExamStartTime').val(data.StuEnroll.ExamStartTime + '~' + data.StuEnroll.ExamEndTime);
//} //}
if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) { if (data.StuEnroll.IsAdmission && data.StuEnroll.IsAdmission == 1) {
$('#IsAdmission').val('是'); $('#IsAdmission').val('是');
if (type == '2') {
//查询录取结果
$('#admmsg').show();
}
} else { } else {
$('#IsAdmission').val('否'); $('#IsAdmission').val('否');
} }
@@ -173,15 +137,14 @@
html += '<input type="text" class="layui-input" readonly="readonly" value="' + etime + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">'; html += '<input type="text" class="layui-input" readonly="readonly" value="' + etime + '" style="margin: -39px 0 0 40px; width: 85%;font-size: 12px;">';
html += '</div>'; html += '</div>';
html += '<br/>'; html += '<br/>';
} }
} }
$('#examDiv').html(html); $('#examDiv').html(html);
}
}
} else { } else {
alert(data.info); alert(data.info);
location.href = '/EducationalAdministration/StuEnrollPhone/Search?type=' + type; location.href = '/EducationalAdministration/StuEnrollPhone/Search?type=' + type;

} }
}, },
error: function (XMLHttpRequest, textStatus, errorThrown) { error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -191,7 +154,7 @@
complete: function () { complete: function () {
} }
}); });
renderForm() renderForm()


}) })


+ 1
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuEnroll/StuEnrollService.cs View File

@@ -1997,8 +1997,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
{ {
try try
{ {
return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.EnrollStatus == 2 &&
x.StuName == entity.StuName && x.StuMobile == entity.StuMobile && x.IDCard == entity.IDCard);
return this.BaseRepository("CollegeMIS").FindEntity<StuEnrollEntity>(x => x.EnrollStatus == 2 && x.StuName == entity.StuName.Trim() && x.IDCard == entity.IDCard);
} }
catch (Exception ex) catch (Exception ex)
{ {


Write Preview
Loading…
Cancel
Save