bjquanjiang
/
DigitalScholl
1
0
複製 0
程式碼 問題管理 0 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

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

新疆警官学校中职
ndbs 1 年之前
父節點
5180712414 c8f1e58984
當前提交
6aaa1f4056
共有 10 個文件被更改，包括 168 次插入 和 726 次删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js
  2. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js
  3. +0
    -7
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js
  4. +88
    -72
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml
  5. +39
    -627
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js
  6. +9
    -15
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml
  7. +19
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js
  8. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs
  9. +9
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs
  10. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js 查看文件

@@ -294,6 +294,7 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamTeacherTime/Index',
width: 1000,
height: 600,
btn: null,
callBack: function (id) {
return top[id].acceptClick(refreshGirdData);
}


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js 查看文件

@@ -92,7 +92,7 @@ var bootstrap = function ($, learun) {
page.search();
};
// 保存数据
acceptClick = function (callBack,i) {
acceptClick = function (callBack, i) {
var selectedRow = $('#gridtable').jfGridGet('rowdata');
if (selectedRow.length == 0) {
return learun.alert.warning("请选择班级！");


+ 0
- 7
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js 查看文件

@@ -4,7 +4,6 @@
* 日 期：2022-06-13 15:41
* 描 述：老师时间管理
*/
var acceptClick;
var refreshGirdData;
var bootstrap = function ($, learun) {
"use strict";
@@ -143,11 +142,5 @@ var bootstrap = function ($, learun) {
refreshGirdData = function () {
$('#gridtable').jfGridSet('reload');
};
acceptClick = function(callBack) {
if (!!callBack) {
learun.layerClose(window.name);
callBack();
}
};
page.init();
}

+ 88
- 72
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml 查看文件

@@ -61,93 +61,109 @@
<div class="condiv divactive" id="tab1">

<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll;-webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-layout-tool">
<div class="lr-layout-tool-left">
<div class="lr-layout-tool-item">
<div id="multiple_condition_query">
<div class="lr-query-formcontent">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">系部</div>
<div id="DeptNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业</div>
<div id="MajorNo"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">年级</div>
<div id="Grade"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级</div>
<div id="ClassNo"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">姓名</div>
<input id="StuName" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">身份证号</div>
<input id="IdentityCardNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">学生编号</div>
<input id="StuNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">学籍号</div>
<input id="StuCode" type="text" class="form-control" />
</div>
</div>
</div>
</div>

@*<div class="lr-layout-tool-item">
<div class="lr-query-btn" style="padding:0 10px;" id="listitem">
点击
</div>
</div>*@
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="overflow-y:scroll; padding-top:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-form-wrap" style="height:90%;" id="form">
@*转入班级*@
<div style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入班级</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">系部<font face="宋体">*</font></div>
<div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
<a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">专业<font face="宋体">*</font></div>
<div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
</div>
<div class="lr-layout-body" style="height:50%;" id="gridtable"></div>

<div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">年级<font face="宋体">*</font></div>
<div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">班级<font face="宋体">*</font></div>
<div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">入班日期<font face="宋体">*</font></div>
<input id="LeaveDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#LeaveDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
</div>
@*转入学生信息*@
<div style="font-size:16px;border-bottom:1px solid #eee;margin:20px 0;">转入学生信息</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">转学前学校</div>
<input id="TransferPreSchool" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
<div id="F_WriteMark" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">转学前年级</div>
<input id="TransferPreGrade" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
<div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
<div class="lr-form-item-title">转学前班级</div>
<input id="TransferPreClass" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">离班日期<font face="宋体">*</font></div>
<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
<div class="lr-form-item-title">转学前专业</div>
<input id="TransferPreMajor" type="text" class="form-control" />
</div>
<div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">异动原因</div>
<textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">转学前学号</div>
<input id="TransferPreStuNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">转学日期</div>
<input id="TransferPreDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#TransferPreDate').trigger('change'); } })" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
<input id="StuName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">学号<font face="宋体">*</font></div>
<input id="StuNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
<input id="SuspensionPeriod" type="text" isvalid="yes" checkexpession="NotNull" />
<div class="lr-form-item-title">证件类型<font face="宋体">*</font></div>
<div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">休学时段(文本框暂时)<font face="宋体">*</font></div>
<input id="SuspensionBeginTime" type="text" isvalid="yes" checkexpession="NotNull" />
@*<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />*@
<div class="lr-form-item-title">证件号码<font face="宋体">*</font></div>
<input id="IdentityCardNo" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">出生日期</div>
<input id="Birthday" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Birthday').trigger('change'); } })" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">性别<font face="宋体">*</font></div>
<div id="Gender" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">民族</div>
<div id="NationalityNo"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">户口所在地</div>
<input id="ResidencePlace" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">籍贯</div>
<input id="RegionNo" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">是否住宿</div>
<div id="IsInAccommodation"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">联系电话</div>
<input id="Mobile" type="text" class="form-control" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">家庭地址</div>
<input id="MailAddress" type="text" class="form-control" />
</div>

</div>

<div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
提交
</div>
</div>
</div>


+ 39
- 627
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js 查看文件

@@ -6,11 +6,10 @@ var bootstrap = function ($, learun) {
"use strict";
var page = {
init: function () {
page.initGird();
page.bind();
},
bind: function () {
//选项卡切换
$('#navultab li').on('click', function () {
if (!$(this).hasClass('active')) {
$(this).parent().find('.active').removeClass('active');
@@ -18,28 +17,24 @@ var bootstrap = function ($, learun) {
$('#condivtab .condiv').eq($(this).index()).siblings().hide()
$('#condivtab .condiv').eq($(this).index()).show()
}
})

$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 280, 400);

});
//转出
$("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/RolloffIndex");
$('#DeptNo').lrselect({
//提交下拉框
$('#NewDeptNo').lrselect({
allowSearch: true,
value: "deptno",
text: "deptname",
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
select: function (item) {
if (item) {
$('#MajorNo').lrselectRefresh({
$('#NewMajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" }
});
} else {
$('#MajorNo').lrselectRefresh({
$('#NewMajorNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
param: { strWhere: "1=1 AND CheckMark=1" }
@@ -48,23 +43,23 @@ var bootstrap = function ($, learun) {

}
});
$('#MajorNo').lrselect({
$('#NewMajorNo').lrselect({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
value: "majorno",
text: "majorname",
param: { strWhere: "1=1 AND CheckMark=1" },
select: function (item) {
var Grades = $("#Grade").lrselectGet();
var Grades = $("#NewGrade").lrselectGet();
if (Grades != null && Grades != "" && Grades != "undefined") {
if (item) {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
});
} else {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
@@ -72,13 +67,13 @@ var bootstrap = function ($, learun) {
}
} else {
if (item) {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
});
} else {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
@@ -87,15 +82,15 @@ var bootstrap = function ($, learun) {
}
}
});
$('#Grade').lrselect({
$('#NewGrade').lrselect({
url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
value: "value",
text: "text",
select: function (item) {
var MajorNos = $("#MajorNo").lrselectGet();
var MajorNos = $("#NewMajorNo").lrselectGet();
if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") {
if (item) {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: {
@@ -103,7 +98,7 @@ var bootstrap = function ($, learun) {
}
});
} else {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
@@ -111,7 +106,7 @@ var bootstrap = function ($, learun) {
}
} else {
if (item) {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: {
@@ -119,7 +114,7 @@ var bootstrap = function ($, learun) {
}
});
} else {
$('#ClassNo').lrselectRefresh({
$('#NewClassNo').lrselectRefresh({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
@@ -129,621 +124,38 @@ var bootstrap = function ($, learun) {

}
});
$('#ClassNo').lrselect({
$('#NewClassNo').lrselect({
allowSearch: true,
url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
value: "classno",
text: "classname"
});
//提交下拉框
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'});
$('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
$('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
// 刷新
$('#lr_refresh').on('click', function () {
location.reload();
});
//查看
$('#lr_view').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('StuId');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行查看！");
return;
}
learun.layerForm({
id: 'form',
title: '查看',
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue,
width: 1162,
height: 600,
btn: null
});
$('#IdCardType').lrDataItemSelect({ code: 'IdCardType' });
$('#Gender').lrDataItemSelect({ code: 'usersexbit' });
$('#NationalityNo').lrDataItemSelect({ code: 'National' });
$('#IsInAccommodation').lrDataItemSelect({ code: 'YesOrNoInt' });
// 提交
$('#subbtn').on('click', function () {
if (!$('body').lrValidform()) {
return false;
}
});
$('#selgridtab').jfGrid({
headData: [
//{
// label: "审核状态", name: "CheckMark", width: 80, align: "center",
// formatter: function (cellvalue) {
// return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
// }
//},
{ label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
{ label: "学号", name: "ProvinceCode", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
}
},
{
label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true,
formatter: function (value) {
return learun.formatDate(value, 'yyyy-MM-dd');
}
},
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
{
label: "民族", name: "NationalityNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'National',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'PolityStatus',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{ label: "年级", name: "Grade", width: 100, align: "left" },
{
label: "系所", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: value,
keyId: 'deptno',
callback: function (_data) {
callback(_data['deptname']);
}
});
}
},
{
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
callback(_data['majorname']);
}
});
}
},
{
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
callback(_data['classname']);
}
});
}
},
{
label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'EduSystem',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'QRCodeHealthStatus',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'StudyModality',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
//{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" },
//{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
//{ label: "余额", name: "Balance", width: 100, align: "left" },
{ label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
{ label: "联系电话", name: "mobile", width: 100, align: "left" },
{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
{
label: "操作", name: "Delete", width: 100, align: "center",
formatter: function (callback, cellvalue, row, op, $cell) {
var $div = $('<div></div>');
var $hbtn = $('<span class="label label-info" style="cursor: pointer;margin-right:8px;"> 移除</span>');
$hbtn.on('click', function () {
tempdatra.map((item, index) => {
if (item.StuNo == cellvalue.StuNo) {
tempdatra.splice(index, 1)
}
});
//console.log(tempdatra)
$('#selgridtab').jfGridSet('refreshdata', tempdatra);

});
$div.append($hbtn);
return $div;
}
},
],
mainId: 'AAIId',
});

},
// 初始化列表
initGird: function () {
$('#gridtable').lrAuthorizeJfGridLei({
url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
headData: [
//{
// label: "审核状态", name: "CheckMark", width: 80, align: "center",
// formatter: function (cellvalue) {
// return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
// }
//},
{ label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
{ label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
{ label: "学号", name: "ProvinceCode", width: 100, align: "left" },
{ label: "姓名", name: "StuName", width: 100, align: "left" },
{
label: "性别", name: "GenderNo", width: 80, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
}
},
{
label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true,
formatter: function (value) {
return learun.formatDate(value, 'yyyy-MM-dd');
}
},
{ label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" },
{
label: "民族", name: "NationalityNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'National',
callback: function (_data) {
callback(_data.text);
}
});
}
},
//{
// label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'PolityStatus',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
{ label: "年级", name: "Grade", width: 100, align: "left" },
{
label: "系所", name: "DeptNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
key: value,
keyId: 'deptno',
callback: function (_data) {
callback(_data['deptname']);
}
});
}
},
{
label: "专业", name: "MajorNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
key: value,
keyId: 'majorno',
callback: function (_data) {
callback(_data['majorname']);
}
});
}
},
{
label: "班级", name: "ClassNo", width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
key: value,
keyId: 'classno',
callback: function (_data) {
callback(_data['classname']);
}
});
}
},
{
label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'EduSystem',
callback: function (_data) {
callback(_data.text);
}
});
var entity = $('body').lrGetFormData();
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveFormOfIn', { keyValue: '', strEntity: JSON.stringify(entity) },
function (res) {
if (res.code == 200) {
setTimeout(function () {
location.reload();
}, 100)
}
},
//{
// label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'QRCodeHealthStatus',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'StudyModality',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" },
//{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" },
//{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" },
//{ label: "余额", name: "Balance", width: 100, align: "left" },
{ label: "家庭地址", name: "MailAddress", width: 100, align: "left" },
{ label: "联系电话", name: "mobile", width: 100, align: "left" },
{ label: "户口所在地", name: "FatherUnit", width: 100, align: "left" },
{ label: "档案所在地", name: "MatherUnit", width: 100, align: "left" },
//{
// label: "五年一贯制", name: "FiveYear", width: 100, align: "left"
// , formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'PieceCultivateWay',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center",
// formatter: function (cellvalue) {
// return cellvalue == "1" ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
// }
//},
//{
// label: "是否上传头像", name: "Photo", width: 80, align: "center",
// formatter: function (cellvalue) {
// if (cellvalue != null && cellvalue != "" && cellvalue != undefined) {
// return cellvalue = "<span class=\"label label-success\">是</span>";
// } else {
// return cellvalue = "<span class=\"label label-danger\">否</span>";
// }
// }
//},
//{ label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true },
//{ label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true },
//{
// label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'BCdCountry',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'BCdOverseasChinese',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'BCdOverseasChinese',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, },
//{ label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, },
//{ label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, },
//{ label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, },
//{ label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, },
//{ label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, },
//{ label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, },
//{ label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, },
//{
// label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'StuLivePlaceType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'StuHealthType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, },
//{ label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, },
//{ label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, },
//{
// label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'RecruitWay',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'RecruitCooperateType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, },
//{ label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, },
//{ label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, },
//{ label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, },
//{ label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, },
//{ label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, },
//{ label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, },
//{ label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, },
//{ label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, },
//{ label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, },
//{ label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true },
//{
// label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'GuardianType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, },
//{
// label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true,
// formatter: function (value) {
// return learun.formatDate(value, 'yyyy-MM-dd');
// }
//},
//{
// label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'IdCardType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, },
//{
// label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'National',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'EpiHealth',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, },
//{ label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, },
//{ label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true },
//{
// label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'GuardianType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, },
//{
// label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true,
// formatter: function (value) {
// return learun.formatDate(value, 'yyyy-MM-dd');
// }
//},
//{
// label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'IdCardType',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, },
//{
// label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'National',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true,
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'EpiHealth',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, },
//{ label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, },

],
mainId: 'StuId',
isPage: true,
rows: 100,
isMultiselect: true,
onSelectRow: function (rowdata) {
var selectedRow = $('#gridtable').jfGridGet('rowdata');
if (list.length < 1) {
list = selectedRow
} else {
// 合并两个数组
list = list.concat(selectedRow)
// 去重
let temp = {}
list = list.reduce((prev, curv) => {
// 若临时对象中有一模一样的item，则什么都不做
if (temp[curv.StuNo]) { }
else {
temp[curv.StuNo] = true
prev.push(curv)
}
return prev
}, [])
//console.log('resources', list)
}
//console.log(list)
tempdatra = list
$('#selgridtab').jfGridSet('refreshdata', tempdatra);
}

});
page.search();
);
})
},
search: function (param) {
param = param || {};
$('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
}
};
refreshGirdData = function () {
page.search();
};
page.init();
}
}

+ 9
- 15
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml 查看文件

@@ -47,10 +47,10 @@
</div>

@*<div class="lr-layout-tool-item">
<div class="lr-query-btn" style="padding:0 10px;" id="listitem">
点击
</div>
</div>*@
<div class="lr-query-btn" style="padding:0 10px;" id="listitem">
点击
</div>
</div>*@
</div>
<div class="lr-layout-tool-right">
<div class=" btn-group btn-group-sm">
@@ -61,10 +61,10 @@
<div class="lr-layout-body" style="height:50%;" id="gridtable"></div>

<div class="lr-layout-body" style="height:40%;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
<div class="lr-form-wrap" id="form">
<div class="lr-form-wrap" style="height:30%;" id="form">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
<div id="AnomalousType" type="text" readonly="readonly" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>
@@ -82,15 +82,9 @@
<div class="lr-form-item-title">异动原因</div>
<textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
<input id="SuspensionPeriod" type="text" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">休学时段(文本框暂时)<font face="宋体">*</font></div>
<input id="SuspensionBeginTime" type="text" isvalid="yes" checkexpession="NotNull" />
@*<input id="EnteDate" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#EnteDate').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />*@
</div>
</div>
<div id="subbtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
提交
</div>
</div>
</div>


+ 19
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js 查看文件

@@ -125,7 +125,8 @@ var bootstrap = function ($, learun) {
});
//提交下拉框
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'});
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
$('#AnomalousType').lrselectSet("02");
$('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
$('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
// 刷新
@@ -302,7 +303,23 @@ var bootstrap = function ($, learun) {
],
mainId: 'AAIId',
});

//提交
$('#subbtn').on('click', function () {
if (!$('body').lrValidform()) {
return false;
}
var entity = $('body').lrGetFormData();
var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
function (res) {
if (res.code == 200) {
setTimeout(function () {
location.reload();
}, 100)
}
}
);
})
},
// 初始化列表
initGird: function () {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs 查看文件

@@ -266,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
,[LessonNo]
,[ELOrder]
,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo)
select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
select NEWID(),AcademicYearNo,t.Semester,replace(Grade,'级','') Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
left join lessoninfo a on t.lessonno=a.lessonno
where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}'
and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' )


+ 9
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs 查看文件

@@ -265,6 +265,15 @@ and examtime is not null and datediff(day, examdate, '{examPlanLesson.ExamDate}'
//{
// entity.ClassStuNum = stuinfo.Count(x => x.ClassNo == entity.ClassNo);
//}
var classList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x => x.CheckMark == true);
if (list.Exists(x => string.IsNullOrEmpty(x.ClassName)))
{
foreach (var item in list.Where(x => string.IsNullOrEmpty(x.ClassName)).ToList())
{
item.ClassName = classList.Where(x => x.ClassNo == item.ClassNo).FirstOrDefault().ClassName;
}
}

this.BaseRepository("CollegeMIS").Insert(list);
//更新排考安排课程表实排班级数、实排人数
//排考安排课程表Id


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs 查看文件

@@ -254,7 +254,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
InsertEntity.DeptNo = item.DeptNo;
InsertEntity.Grade = item.Grade;
InsertEntity.EduSystem = item.EduSystem;
InsertEntity.EnteDate = DateTime.Now.ToDate(); //前端还是后端处理
InsertEntity.EnteDate = entity.EnteDate; //前端还是后端处理
//新数据
InsertEntity.AnomalousType = entity.AnomalousType;
InsertEntity.ChangeReason = entity.ChangeReason;


Write Preview
Loading…
取消
儲存