bjquanjiang
/
DigitalScholl
1
0
Derivar 0
Código Questões 0 Pedidos de integração 0 Lançamentos 0 Wiki Trabalho
Ver a proveniência

Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

临城职教中职
ndbs há 2 anos
ascendente
a8fade9eb8 fd7681a1ec
cometimento
7ac907da17
11 ficheiros alterados com 33111 adições e 30952 eliminações
Visualização em 2 colunas
Opções das diferenças
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff
  1. +17
    -30
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs
  2. +42
    -43
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs
  3. +198
    -323
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml
  4. +23
    -26
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Search.cshtml
  5. +91
    -100
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/SearchResult.cshtml
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config
  7. +32717
    -30378
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
  8. +3
    -22
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs
  9. +14
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs
  10. +1
    -4
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs
  11. +4
    -22
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs

+ 17
- 30
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerController.cs Ver ficheiro

@@ -261,19 +261,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
return Success("取消成功！");
}

/// <summary>
/// 保存草稿
/// </summary>
/// <param name="keyValue"></param>
/// <param name="strEntity"></param>
/// <returns></returns>
public ActionResult DraftForm(string keyValue, string strEntity)
{
StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
entity.IsSubmit = false;
stuVolunteerIBLL.SaveEntity(keyValue, entity);
return Success("保存成功！");
}
/// <summary>
/// 提交选择专业
/// </summary>
@@ -283,28 +270,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
public ActionResult SubmitForm(string keyValue, string strEntity)
{
StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
entity.IsSubmit = true;
stuVolunteerIBLL.SaveEntity(keyValue, entity);
return Success("提交成功！");
}


public ActionResult Search(string CardNo, string txtPass)
{
var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
if (StuVolunteerData != null)
{
var jsonData = new
{
StuVolunteer = StuVolunteerData,
};
return Success(jsonData);
}
else
{
return Success(null);
}
}
//public ActionResult Search(string CardNo, string txtPass)
//{
// var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
// if (StuVolunteerData != null)
// {
// var jsonData = new
// {
// StuVolunteer = StuVolunteerData,
// };
// return Success(jsonData);
// }
// else
// {
// return Success(null);
// }
//}

#endregion
}


+ 42
- 43
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuVolunteerPhoneController.cs Ver ficheiro

@@ -123,71 +123,70 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
#region 扩展数据

/// <summary>
/// 报名草稿
/// 登录查询
/// </summary>
/// <param name="keyValue"></param>
/// <param name="strEntity"></param>
/// <returns></returns>
public ActionResult DraftForm(string keyValue, string strEntity)
[HttpPost]
[AjaxOnly]
public ActionResult IsExist(string CardNo, string Password)
{
StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
entity.IsSubmit = false;
stuVolunteerIBLL.DraftForm(keyValue, entity);
return Success("保存成功！");
var entity = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
if (entity == null)
{
return Fail("身份证号不存在！");
}
if (Password != CardNo.Substring(CardNo.Length - 6))
{
return Fail("密码错误！");
}
return Success("查询成功！");
}

/// <summary>
/// 提交选择专业
/// 报名提交
/// </summary>
/// <param name="keyValue"></param>
/// <param name="strEntity"></param>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult SubmitForm(string keyValue, string strEntity)
{
StuVolunteerEntity entity = strEntity.ToObject<StuVolunteerEntity>();
entity.IsSubmit = true;
stuVolunteerIBLL.SubmitForm(entity.CardNo, entity);
entity.EnrollTime = DateTime.Now;
stuVolunteerIBLL.SubmitForm(keyValue, entity);
return Success("提交成功！");
}


public ActionResult Search(string CardNo, string txtPass)
{
var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
if (StuVolunteerData != null)
{
var jsonData = new
{
StuVolunteer = StuVolunteerData,
};
return Success(jsonData);
}
else
{
return Success(null);
}
}

public ActionResult SearchForm(string CardNo, string txtPass)
//public ActionResult Search(string CardNo, string txtPass)
//{
// var StuVolunteerData = new StuVolunteerEntity();// stuVolunteerIBLL.IsEnrollByCard(CardNo);
// if (StuVolunteerData != null)
// {
// var jsonData = new
// {
// StuVolunteer = StuVolunteerData,
// };
// return Success(jsonData);
// }
// else
// {
// return Success(null);
// }
//}
[HttpGet]
[AjaxOnly]
public ActionResult SearchForm(string CardNo)
{
var StuVolunteerData = stuVolunteerIBLL.IsEnrollByCard(CardNo);
if (StuVolunteerData != null)
{
var jsonData = new
{
StuVolunteer = StuVolunteerData,
};
return Success(jsonData);
}
else
{
return Success(null);
}
var StuVolunteerData = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
return Success(StuVolunteerData);
}

public ActionResult SearchCard(string CardNo)
{
var StuVolunteerData = stuVolunteerIBLL.GetCardId(CardNo);
var StuVolunteerData = stuVolunteerIBLL.GetEntityByCardNo(CardNo);
var jsonData = new
{
StuVolunteer = StuVolunteerData,


+ 198
- 323
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/FormApply.cshtml Ver ficheiro

@@ -19,93 +19,13 @@
<link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
<link href="~/Content/css/fromAdd.css" rel="stylesheet" />
<style>
#IdCardPtoUpload1 {
width: 107px;
height: 107px;
border: 1px solid #E9E9E9;
overflow: hidden;
margin: 0;
cursor: pointer;
text-align: center;
.enablebtn {
pointer-events: none;
background: #a19d95;
}

#IdCardPtoUpload1 img {
width: 100%;
height: 100%;
}

#IdCardPtoUpload1 .layui-upload-img {
width: 50%;
height: auto;
margin-top: 8px;
}

#IdCardPtoUpload1 div {
font-size: 14px;
color: #DCDBDB;
}

#IdCardPtoUpload2 {
width: 107px;
height: 107px;
border: 1px solid #E9E9E9;
overflow: hidden;
margin: 0;
cursor: pointer;
text-align: center;
}

#IdCardPtoUpload2 img {
width: 100%;
height: 100%;
}

#IdCardPtoUpload2 .layui-upload-img {
width: 50%;
height: auto;
margin-top: 8px;
}

#IdCardPtoUpload2 div {
font-size: 14px;
color: #DCDBDB;
}

#MidAchievementUpload {
width: 107px;
height: 107px;
border: 1px solid #E9E9E9;
overflow: hidden;
margin: 0;
cursor: pointer;
text-align: center;
}

#MidAchievementUpload img {
width: 100%;
height: 100%;
}

#MidAchievementUpload .layui-upload-img {
width: 50%;
height: auto;
margin-top: 8px;
}

#MidAchievementUpload div {
font-size: 14px;
color: #DCDBDB;
}
</style>
</head>
<body>

@*<div class="header">
<div class="fromSec">

<a href="#">数字化智慧校园</a> <span class="headerLine">|</span> <span>教职工信息注册</span>
</div>
</div>*@
<div class="warpper" id="app">
<!-- / index_sec5 -->

@@ -115,31 +35,26 @@
<form class="layui-form" action="">
<!-- / chickForm_sec1 -->
<div class="chickForm_sec1">
@*<div class="chickInput">
<span class="chickInputLable"><span>*</span> 姓名</span>
<input type="text" id="StuName" name="StuName" lay-verify="required" placeholder="请输入姓名" class="layui-input">
</div>*@

<div class="chickInput">
<span class="chickInputLable"><span>*</span> 专业一 </span>
<span class="chickInputLable"><span>*</span> 第一意向 </span>
<div class="chickInputBox chickInputBoxs">
<select id="MajorOne" name="MajorOne" lay-verify="">
<select id="MajorOne" name="MajorOne" lay-verify="required">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 专业二 </span>
<span class="chickInputLable"><span>*</span> 第二意向 </span>
<div class="chickInputBox chickInputBoxs">
<select id="MajorTwo" name="MajorTwo" lay-verify="">
<select id="MajorTwo" name="MajorTwo" lay-verify="required">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 专业三 </span>
<span class="chickInputLable"><span>*</span> 第三意向 </span>
<div class="chickInputBox chickInputBoxs">
<select id="MajorThree" name="MajorThree" lay-verify="">
<select id="MajorThree" name="MajorThree" lay-verify="required">
<option value="">请选择</option>
</select>
</div>
@@ -147,127 +62,22 @@
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 服从安排</span>
<div class="chickInputBox chickInputBoxs">
<select id="Gender" name="Gender" lay-verify="">
<select id="IsPlan" name="IsPlan" lay-verify="required">
<option value="">请选择</option>
<option value="true">是</option>
<option value="false">否</option>
</select>
</div>
</div>
@*
<div class="chickInput">
<span class="chickInputLable">民族</span>
<div class="chickInputBox">
<select id="Nationals" name="Nationals" lay-verify="">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 住址</span>
<input type="text" id="HomeAddress" name="HomeAddress" lay-verify="required" placeholder="请输入住址" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 身份证号</span>
<input type="text" id="IDCard" name="IDCard" lay-verify="required" placeholder="请输入身份证号" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 手机号</span>
<input type="text" id="StuMobile" name="StuMobile" lay-verify="required" placeholder="请输入手机号" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 毕业学校</span>
<input type="text" id="FromSchool" name="FromSchool" lay-verify="required" placeholder="请输入毕业学校" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 中考总分</span>
<input type="number" id="MidTermExam" name="MidTermExam" lay-verify="required" placeholder="请输入中考总分" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"> 特长</span>
<input type="text" id="Specialty" name="Specialty" placeholder="请输入特长" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 地市</span>
<div class="chickInputBox chickInputBoxs">
<select id="City" name="City" lay-verify="" lay-filter="City">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 县区</span>
<div class="chickInputBox chickInputBoxs">
<select id="County" name="County" lay-verify="" lay-filter="County">
<option value="">请选择</option>
</select>
</div>
</div>
<div class="chickInput">
<span class="chickInputLable">身份证正面照片</span>
<div class="chickInputBox">
<div class="layui-upload-list UploadFile" id="IdCardPtoUpload1">
<img src="~/Content/images/chick1.png" class="layui-upload-img" />
<div>选择</div>
</div>
</div>
</div>
<div class="chickInput" hidden>
<span class="chickInputLable" hidden><span>*</span> 身份证正面照片</span>
<input type="text" id="IdCardPto1" name="IdCardPto1" class="layui-input">
</div>

<div class="chickInput">
<span class="chickInputLable">身份证反面照片</span>
<div class="chickInputBox">
<div class="layui-upload-list UploadFile" id="IdCardPtoUpload2">
<img src="~/Content/images/chick1.png" class="layui-upload-img" />
<div>选择</div>
</div>
</div>
</div>
<div class="chickInput" hidden>
<span class="chickInputLable" hidden><span>*</span> 身份证反面照片</span>
<input type="text" id="IdCardPto2" name="IdCardPto2" class="layui-input">
</div>
<div class="chickInput">
<span class="chickInputLable">初中毕业证</span>
<div class="chickInputBox">
<div class="layui-upload-list" id="chickUpload">
<img src="~/Content/images/chick1.png" class="layui-upload-img" />
<div>选择</div>
</div>
</div>
</div>
<div class="chickInput" hidden>
<span class="chickInputLable" hidden><span>*</span> 初中毕业证照片</span>
<input type="text" id="MidDiplomaPto" name="MidDiplomaPto" class="layui-input">
</div>

<div class="chickInput">
<span class="chickInputLable">中考成绩截图</span>
<div class="chickInputBox">
<div class="layui-upload-list UploadFile" id="MidAchievementUpload">
<img src="~/Content/images/chick1.png" class="layui-upload-img" />
<div>选择</div>
</div>
</div>
</div>
<div class="chickInput" hidden>
<span class="chickInputLable" hidden><span>*</span> 中考成绩照片</span>
<input type="text" id="MidAchievementPto" name="MidAchievementPto" class="layui-input">
</div>*@

<div class="chickInput">
<span class="chickInputLable"> 备注</span>
<input type="text" id="Remark" name="Remark" class="layui-input">
<input type="text" id="Demo" name="Demo" class="layui-input">
</div>
</div>
<!-- / chickForm_sec1 -->
<div class="chickBtn" lay-submit lay-filter="*">保存草稿</div>
<div class="chickBtn" lay-submit lay-filter="*">保存并提交</div>
@*<div class="submitBtn" lay-submit lay-filter="*">提交</div>
<div class="saveBtn" lay-submit lay-filter="*">保存草稿</div>*@
<div class="chickBtn enablebtn" id="btnsave" lay-submit lay-filter="save">保存</div>
<div class="chickBtn enablebtn" id="btnsaveAndSubmit" lay-submit lay-filter="saveAndSubmit">保存并提交</div>
</form>
</div>
</div>
@@ -277,30 +87,173 @@
<script src="~/Content/js/jquery.min.js"></script>
<script src="~/Content/layui/layui.all.js"></script>
<script src="~/Content/vue/vue.js"></script>
<script src="~/PhonePage/server.js"></script>
<script>
var keyValue =
var today = formatDateTimesM();
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
//登录按钮点击
form.on('submit(*)', function (data) {
var strEntity = JSON.stringify(data.field);
console.log(strEntity,123)
//strEntity.keyValue = keyValue;
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
<script>
var keyValue = request('keyValue');
var EnrollStatus = null;
//var today = formatDateTimesM();
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
//保存
form.on('submit(save)', function (data) {
var strEntity = data.field;
if (EnrollStatus == 1) {
return alert('您已报名！');
}
if (strEntity.MajorOne === strEntity.MajorTwo ||
strEntity.MajorOne === strEntity.MajorThree ||
strEntity.MajorTwo === strEntity.MajorThree) {
return alert('意向不可重复！');
}
strEntity.EnrollStatus = 0;

$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/SubmitForm',
data: { keyValue: keyValue, strEntity: JSON.stringify(strEntity) },
type: "POST",
dataType: "json",
async: true,
cache: false,
success: function (data) {
if (data.code == 200) {
alert('保存成功！');
location.href = '/EducationalAdministration/StuVolunteerPhone/Search';
} else {
return alert(data.data);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
beforeSend: function () {
},
complete: function () {
}
});

return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。

});

//保存并提交
form.on('submit(saveAndSubmit)', function (data) {
var strEntity = data.field;
if (EnrollStatus == 1) {
return alert('您已报名！');
}
if (strEntity.MajorOne === strEntity.MajorTwo ||
strEntity.MajorOne === strEntity.MajorThree ||
strEntity.MajorTwo === strEntity.MajorThree) {
return alert('意向不可重复！');
}

strEntity.EnrollStatus = 1;
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/SubmitForm',
data: { keyValue: keyValue, strEntity: JSON.stringify(strEntity) },
type: "POST",
dataType: "json",
async: true,
cache: false,
success: function (data) {
if (data.code == 200) {
alert('提交成功！');
location.href = '/EducationalAdministration/StuVolunteerPhone/Search';
} else {
return alert(data.data);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
beforeSend: function () {
},
complete: function () {
}
});

return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。

});

var upload = layui.upload;
});
$(window).load(function () {

//绑定专业
$.ajax({
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorOne").html(str);
},
});
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/DraftForm',
data: { strEntity: strEntity },
type: "POST",
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorTwo").html(str);
},
});
$.ajax({
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorThree").html(str);
},
});

//获取数据
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/GetFormData?keyValue=' + keyValue,
//data: { CardNo: CardNo },
type: "GET",
dataType: "json",
async: true,
async: false,
cache: false,
success: function (data) {
if (data.code == 200) {
alert('报名成功，请等待考试通知');
location.href = '/EducationalAdministration/StuVolunteer/Link?CardNo=' + CardNo;
var data = data.data.StuVolunteer;
//报名状态
EnrollStatus = data.EnrollStatus;

$('#MajorOne').val(data.MajorOne);
$('#MajorTwo').val(data.MajorTwo);
$('#MajorThree').val(data.MajorThree);
$('#Demo').val(data.Demo);
if (data.IsPlan == true) {
$('#IsPlan').val('true');
} else if (data.IsPlan == false) {
$('#IsPlan').val('false');
}

if (data.EnrollStatus == 1) {
//已提交所选专业 的学生，不可重复提交
$('#btnsave').addClass('enablebtn');
$('#btnsaveAndSubmit').addClass('enablebtn');
} else {
$('#btnsave').removeClass('enablebtn');
$('#btnsaveAndSubmit').removeClass('enablebtn');
}

} else {
return alert(data.data);
alert(data.info);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
@@ -310,112 +263,34 @@
complete: function () {
}
});
//保存并提交
//$.ajax({
// url: '/EducationalAdministration/StuVolunteer/SubmitForm?keyValue=&IDCARD=' + CardId,
// data: { strEntity: strEntity },
// type: "POST",
// dataType: "json",
// async: true,
// cache: false,
// success: function (data) {
// if (data.code == 200) {
// alert('报名成功，请等待考试通知');
// location.href = '/EducationalAdministration/StuVolunteer/Link?CardId=' + CardId;
// } else {
// return alert(data.data);
// }
// },
// error: function (XMLHttpRequest, textStatus, errorThrown) {
// },
// beforeSend: function () {
// },
// complete: function () {
// }
//});
return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。

renderForm();
});

var laydate = layui.laydate;

//时间选择
laydate.render({
elem: '#Birthday',
min: today.y + '-' + today.m + '-' + today.d
});

var upload = layui.upload;
});
$(window).load(function () {
//$('.chickInputBoxs input').attr('lay-verify', 'required');
//专业
$.ajax({
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorOne").html(str);
},
});
$.ajax({
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorTwo").html(str);
},
});
$.ajax({
url: "/EducationalAdministration/EmpInfoEnternal/GetMap?code=" + "CdMajorInfo",
async: false,
success: function (msg) {
var companys = $.parseJSON(msg).data.data;
var str = '<option value="">请选择</option>';
$.each(companys,
function (i, item) {
str += '<option value="' + item.id + '">' + item.majorname + '</option>'
})
$("#MajorThree").html(str);
},
});
renderForm();
});


//重新渲染表单
function renderForm() {
layui.use('form', function () {
var form = layui.form//高版本建议把括号去掉，有的低版本，需要加()
form.render();
});
}
function formatDateTimesM() {
var date = new Date(1960, 0, 0);
var y = date.getFullYear();
var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
var min = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();

return {
y: y,
m: m,
d: d,
h: h,
min: min
//重新渲染表单
function renderForm() {
layui.use('form', function () {
var form = layui.form//高版本建议把括号去掉，有的低版本，需要加()
form.render();
});
}
};
</script>
function formatDateTimesM() {
var date = new Date(1960, 0, 0);
var y = date.getFullYear();
var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
var min = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();

return {
y: y,
m: m,
d: d,
h: h,
min: min
}
};
</script>
</body>
</html>

+ 23
- 26
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/Search.cshtml Ver ficheiro

@@ -25,7 +25,7 @@
<!-- / index_sec5 -->
<div class="chickForm_sec">
<div class="fromSec">
<div class="chickT">登录并查询</div>
<div class="chickT">录取查询</div>
<form class="layui-form" action="">
<!-- / chickForm_sec1 -->
<div class="chickForm_sec1">
@@ -39,7 +39,7 @@
</div>
</div>
<!-- / chickForm_sec1 -->
<div class="chickBtn" lay-submit lay-filter="*">登录</div>
<div class="chickBtn" lay-submit lay-filter="*">登录并查询</div>
</form>
</div>
</div>
@@ -53,37 +53,34 @@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
<script>
//var today = formatDateTimesM();
//var CardNo = $('#txtAccount').val();
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
//按钮点击
form.on('submit(*)', function (data) {
var strEntity = JSON.stringify(data.field);
if (data) {
location.href = '/EducationalAdministration/StuVolunteerPhone/SearchResult?&CardNo=' + $('#txtAccount').val() + '&txtPass=' + $('#txtPass').val();
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/IsExist',
data: { CardNo: $('#txtAccount').val(), Password: $('#txtPass').val() },
type: "Post",
dataType: "json",
async: true,
cache: false,
success: function (data) {
if (data.code == 200) {
location.href = '/EducationalAdministration/StuVolunteerPhone/SearchResult?CardNo=' + $('#txtAccount').val();
} else {
alert(data.info);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
beforeSend: function () {
},
complete: function () {
}
});

//$.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; //阻止表单跳转。如果需要表单跳转，去掉这段即可。

});


+ 91
- 100
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuVolunteerPhone/SearchResult.cshtml Ver ficheiro

@@ -18,7 +18,12 @@
<link href="~/Content/css/common.css" rel="stylesheet" />
<link href="~/Content/layui/css/layui.css" rel="stylesheet" media="all" />
<link href="~/Content/css/fromAdd.css" rel="stylesheet" />
<style>
.enablebtn {
pointer-events: none;
background: #a19d95;
}
</style>
</head>
<body>
<div class="warpper" id="app">
@@ -30,16 +35,16 @@
<!-- / chickForm_sec1 -->
<div class="chickForm_sec1">
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 姓名</span>
<span class="chickInputLable"> 姓名</span>
<input type="text" id="StuName" name="StuName" class="layui-input" readonly="readonly">
<input type="text" id="keyValue" name="keyValue" class="layui-input" hidden="hidden">
</div>
<div class="chickInput">
<span class="chickInputLable"><span>*</span> 身份证号</span>
<span class="chickInputLable">身份证号</span>
<input type="text" id="CardNo" name="CardNo" class="layui-input" readonly="readonly">
</div>
<div class="chickInput" >
<span class="chickInputLable"><span>*</span> 是否录取</span>
<div class="chickInput">
<span class="chickInputLable"> 是否录取</span>
<input type="text" id="IsEnroll" name="IsEnroll" readonly="readonly">
</div>
</div>
@@ -58,66 +63,44 @@
<script src="~/Content/layui/layui.all.js"></script>
<script src="~/Content/vue/vue.js"></script>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuVolunteerPhone/server.js")
<script>
var StuName = request('StuName');
var CardNo = request('CardNo');
var txtPass = request('txtPass');
var IsEnroll = request('IsEnroll');
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
//按钮点击
var keyValue = null;
var strEntity = null;
form.on('submit(*)', function (data) {
location.href = '/EducationalAdministration/StuVolunteerPhone/FormApply?keyValue='+ keyValue;
});

// $.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 () {
//查询
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/SearchForm',
data: { CardNo: CardNo, txtPass: txtPass },
type: "GET",
dataType: "json",
async: true,
cache: false,
success: function (data) {
if (data.code == 200) {
var data = data.data.StuVolunteer;
<script>
//身份证号
var CardNo = request('CardNo');
var keyValue = '';
layui.use(['form', 'laydate', 'upload'], function () {
var form = layui.form;
//按钮点击

var strEntity = null;
form.on('submit(*)', function (data) {
location.href = '/EducationalAdministration/StuVolunteerPhone/FormApply?keyValue=' + keyValue;
});

// return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。


//var laydate = layui.laydate;

//时间选择
//laydate.render({
// elem: '#Birthday',
// min: today.y + '-' + today.m + '-' + today.d
//});

});
$(window).load(function () {
//查询
$.ajax({
url: '/EducationalAdministration/StuVolunteerPhone/SearchForm',
data: { CardNo: CardNo },
type: "GET",
dataType: "json",
async: true,
cache: false,
success: function (data) {
if (data.code == 200) {
var data = data.data;
keyValue = data.ID;
$('#StuName').val(data.StuName);
$('#CardNo').val(data.CardNo);
$('#keyValue').val(data.ID);
@@ -125,49 +108,57 @@

if (data.IsEnroll == true) {
$('#IsEnroll').val('是');

$('#btnsubmit').removeClass('enablebtn');

} else {

$('#IsEnroll').val('否');

//未被录取的学生，不可以选专业
$('#btnsubmit').addClass('enablebtn');
}
} else {
alert(data.info);

} else {
alert(data.info);
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
beforeSend: function () {
},
complete: function () {
}
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
},
beforeSend: function () {
},
complete: function () {
}
});
});

renderForm()

})
renderForm();

//重新渲染表单
function renderForm() {
layui.use('form', function () {
var form = layui.form//高版本建议把括号去掉，有的低版本，需要加()
form.render();
});
}
function formatDateTimesM() {
var date = new Date(1960, 0, 0);
var y = date.getFullYear();
var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
var min = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();

return {
y: y,
m: m,
d: d,
h: h,
min: min
})

//重新渲染表单
function renderForm() {
layui.use('form', function () {
var form = layui.form//高版本建议把括号去掉，有的低版本，需要加()
form.render();
});
}
};
</script>
function formatDateTimesM() {
var date = new Date(1960, 0, 0);
var y = date.getFullYear();
var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1;
var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
var h = date.getHours() < 10 ? '0' + date.getHours() : date.getHours();
var min = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes();

return {
y: y,
m: m,
d: d,
h: h,
min: min
}
};
</script>
</body>
</html>

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config Ver ficheiro

@@ -94,7 +94,7 @@
<add key="vs:EnableBrowserLink" value="false"/>
<!--获取高职版跳转地址url -->
<!--<add key="DigitalschoolMisLoginurl" value="http://192.168.2.126:9000/LoginHandler.ashx"/>-->
<add key="DigitalschoolMisLoginurl" value="http://192.168.100.225:9000/LoginHandler.ashx"/>
<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>
<!--<add key="DigitalschoolMisLoginurl" value="http://123.57.209.16:9000/LoginHandler.ashx"/>-->
<!--<add key="DigitalschoolMisLoginurl" value="http://112.45.152.8:8082/LoginHandler.ashx"/>-->
<!-- ================== 默认密码 ================== -->


+ 32717
- 30378
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM
A apresentação das diferenças no ficheiro foi suprimida por ser demasiado grande
Ver ficheiro


+ 3
- 22
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerBLL.cs Ver ficheiro

@@ -313,37 +313,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}


public StuVolunteerEntity IsEnrollByCard(string CardNo)
{
try
{
return stuVolunteerService.IsEnrollByCard(CardNo);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}

/// <summary>
/// 获取StuVolunteer表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public StuVolunteerEntity GetCardId(string CardNo)
public StuVolunteerEntity GetEntityByCardNo(string CardNo)
{
try
{
return stuVolunteerService.GetCardId(CardNo);
return stuVolunteerService.GetEntityByCardNo(CardNo);
}
catch (Exception ex)
{


+ 14
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerEntity.cs Ver ficheiro

@@ -204,11 +204,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// </summary>
[Column("CLASSNO")]
public string ClassNo { get; set; }
///// <summary>
///// 是否提交专业
///// </summary>
//[Column("ISSUBMIT")]
//public bool? IsSubmit { get; set; }
/// <summary>
/// 是否提交专业
/// 报名状态 0 草稿，1提交
/// </summary>
[Column("ISSUBMIT")]
public bool? IsSubmit { get; set; }
[Column("ENROLLSTATUS")]
public int? EnrollStatus { get; set; }
/// <summary>
/// 报名时间
/// </summary>
[Column("ENROLLTIME")]
public DateTime? EnrollTime { get; set; }
/// <summary>
/// 是否服从安排
/// </summary>
@@ -231,6 +241,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
public void Modify(string keyValue)
{
this.ID = keyValue;
this.UpdateTime= DateTime.Now;
}
#endregion
#region 扩展字段


+ 1
- 4
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerIBLL.cs Ver ficheiro

@@ -100,15 +100,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
/// <param name="entity"></param>
void SubmitForm(string keyValue, StuVolunteerEntity entity);


StuVolunteerEntity IsEnrollByCard(string CardNo);

/// <summary>
/// 获取StuVolunteer表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <returns></returns>
StuVolunteerEntity GetCardId(string keyValue);
StuVolunteerEntity GetEntityByCardNo(string keyValue);
#endregion
}
}

+ 4
- 22
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuVolunteer/StuVolunteerService.cs Ver ficheiro

@@ -393,7 +393,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
try
{
entity.Modify(keyValue);
entity.UpdateTime = DateTime.Now;
this.BaseRepository("CollegeMIS").Update(entity);
}
catch (Exception ex)
@@ -408,35 +407,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
}
}
}
public StuVolunteerEntity IsEnrollByCard(string CardNo)
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<StuVolunteerEntity>(x => x.CardNo == CardNo && x.IsEnroll == true);
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

/// <summary>
/// 获取StuVolunteer表实体数据
/// </summary>
/// <param name="keyValue">主键</param>
/// <param name="CardNo">身份证号</param>
/// <returns></returns>
public StuVolunteerEntity GetCardId(string CardId)
public StuVolunteerEntity GetEntityByCardNo(string CardNo)
{
try
{
return this.BaseRepository("CollegeMIS").FindEntity<StuVolunteerEntity>(x => x.CardNo == CardId);
return this.BaseRepository("CollegeMIS").FindEntity<StuVolunteerEntity>(x => x.CardNo == CardNo);
}
catch (Exception ex)
{


Escrever Pré-visualizar
Carregando…
Cancelar
Guardar