bjquanjiang
/
DigitalScholl
1
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

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

新疆警官学校中职
dyy 1 år sedan
förälder
40aa8ab79e c595fed2cb
incheckning
ffd72641f9
15 ändrade filer med 547 tillägg och 401 borttagningar
Unifierad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml
  2. +18
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml
  4. +210
    -201
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js
  5. +104
    -102
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml
  6. +8
    -8
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml
  7. +13
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js
  8. +84
    -76
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml
  9. +13
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js
  10. +19
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs
  11. +26
    -0
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs
  12. +7
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs
  13. +38
    -3
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs
  14. +3
    -2
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs
  15. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs

+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml Visa fil

@@ -50,6 +50,7 @@
<a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a> <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
<a id="lr_delete" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;删除</a> <a id="lr_delete" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;删除</a>
<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a> <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
<a id="lr_view" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
</div> </div>
</div> </div>
</div> </div>


+ 18
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js Visa fil

@@ -77,6 +77,24 @@ var bootstrap = function ($, learun) {
}); });
} }
}); });
// 查看
$('#lr_view').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行编辑！");
return;
}
learun.layerForm({
id: 'formview',
title: '查看',
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/FormView?keyValue=' + keyValue,
width: 1000,
height: 600,
btn: null
});
}
});
}, },
initGird: function () { initGird: function () {
$('#gridtable').lrAuthorizeJfGridLei({ $('#gridtable').lrAuthorizeJfGridLei({


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml Visa fil

@@ -96,8 +96,8 @@
<input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" /> <input id="CheckTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" />
</div> </div>
<div class="col-xs-12 lr-form-item" data-table="StuTransferInfo"> <div class="col-xs-12 lr-form-item" data-table="StuTransferInfo">
<div class="lr-form-item-title">审核意见</div>
<input id="Remark" type="text" class="form-control" readonly="readonly" />
<div class="lr-form-item-title">备注</div>
<textarea id="Remark" class="form-control" style="height: 100px;" readonly="readonly"></textarea>
</div> </div>






+ 210
- 201
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js Visa fil

@@ -18,13 +18,13 @@ var bootstrap = function ($, learun) {
var modulesTree = learun.clientdata.get(['modulesTree']); var modulesTree = learun.clientdata.get(['modulesTree']);
$('#changeMajor').on('click', function () { $('#changeMajor').on('click', function () {
let item = modulesTree[0].filter(item => { let item = modulesTree[0].filter(item => {
  return item.F_FullName == "教务信息管理"
})
return item.F_FullName == "教务信息管理"
})
let modules = modulesTree[item[0].F_ModuleId].filter(item => { let modules = modulesTree[item[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动"
 })
return item.F_EnCode == "Transfermenu" //学籍异动菜单
})
let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => { let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
return item.F_FullName == "转专业"
return item.F_EnCode == "MajorIndex"// "转专业"
}) })
learun.frameTab.open(moduleitem[0]); learun.frameTab.open(moduleitem[0]);
}) })
@@ -33,10 +33,10 @@ var bootstrap = function ($, learun) {
return item.F_FullName == "教务信息管理" return item.F_FullName == "教务信息管理"
}) })
let modules = modulesTree[item[0].F_ModuleId].filter(item => { let modules = modulesTree[item[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动"
return item.F_EnCode == "Transfermenu" //学籍异动菜单
}) })
let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => { let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
return item.F_FullName == "休学复学"
return item.F_EnCode == "RestAgain"// "休学复学"
}) })
learun.frameTab.open(moduleitem[0]); learun.frameTab.open(moduleitem[0]);
}) })
@@ -45,10 +45,10 @@ var bootstrap = function ($, learun) {
return item.F_FullName == "教务信息管理" return item.F_FullName == "教务信息管理"
}) })
let modules = modulesTree[item[0].F_ModuleId].filter(item => { let modules = modulesTree[item[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动"
return item.F_EnCode == "Transfermenu" //学籍异动菜单
}) })
let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => { let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
return item.F_FullName == "退学异动"
return item.F_EnCode == "DropOut"// "退学异动"
}) })
learun.frameTab.open(moduleitem[0]); learun.frameTab.open(moduleitem[0]);
}) })
@@ -57,10 +57,10 @@ var bootstrap = function ($, learun) {
return item.F_FullName == "教务信息管理" return item.F_FullName == "教务信息管理"
}) })
let modules = modulesTree[item[0].F_ModuleId].filter(item => { let modules = modulesTree[item[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动"
return item.F_EnCode == "Transfermenu" //学籍异动菜单
}) })
let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => { let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
return item.F_FullName == "转入转出异动"
return item.F_EnCode == "InAndOut" //"转入转出异动"
}) })
learun.frameTab.open(moduleitem[0]); learun.frameTab.open(moduleitem[0]);
}) })
@@ -69,10 +69,10 @@ var bootstrap = function ($, learun) {
return item.F_FullName == "教务信息管理" return item.F_FullName == "教务信息管理"
}) })
let modules = modulesTree[item[0].F_ModuleId].filter(item => { let modules = modulesTree[item[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动"
return item.F_EnCode == "Transfermenu" //学籍异动菜单
}) })
let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => { let moduleitem = modulesTree[modules[0].F_ModuleId].filter(item => {
return item.F_FullName == "学籍异动审核"
return item.F_EnCode == "CheckIndex" //"学籍异动审核"
}) })
learun.frameTab.open(moduleitem[0]); learun.frameTab.open(moduleitem[0]);
}) })
@@ -105,6 +105,10 @@ var bootstrap = function ($, learun) {
$('#lr_view').on('click', function () { $('#lr_view').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID'); var keyValue = $('#gridtable').jfGridValue('ID');
if (learun.checkrow(keyValue)) { if (learun.checkrow(keyValue)) {
if (keyValue.indexOf(',') != -1) {
learun.alert.warning("只能选择一条记录进行编辑！");
return;
}
learun.layerForm({ learun.layerForm({
id: 'formview', id: 'formview',
title: '查看', title: '查看',
@@ -121,24 +125,16 @@ var bootstrap = function ($, learun) {
url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList', url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList',
headData: [ headData: [
{ label: '姓名', name: 'StuName', width: 100, align: "left" }, { label: '姓名', name: 'StuName', width: 100, align: "left" },
{ label: '学号', name: 'StuNo', width: 140, align: "left" },
//{ label: '性别', name: 'Gender', width: 200, align: "left" },
{ label: '身份证号', name: 'IdentityCardNo', width: 160, align: "left" },
{ label: '学号', name: 'StuNo', width: 160, align: "left" },
{ {
label: '异动类型', name: 'AnomalousType', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'StuChangeType',
callback: function (_data) {
callback(_data.text);
}
});
label: "性别", name: "GenderNo", width: 80, align: "left",
formatter: function (cellvalue) {
return cellvalue == true ? "男" : "女";
} }
}, },
{ label: '异动原因', name: 'ChangeReason', width: 300, align: "left" },
{ label: '身份证号', name: 'IdentityCardNo', width: 200, align: "left" },
{ {
label: '原班级', name: 'ClassNo', width: 100, align: "left",
label: '原班级', name: 'ClassNo', width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) { formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', { learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -151,7 +147,7 @@ var bootstrap = function ($, learun) {
} }
}, },
{ {
label: '原专业', name: 'MajorNo', width: 100, align: "left",
label: '原专业', name: 'MajorNo', width: 150, align: "left",
formatterAsync: function (callback, value, row, op, $cell) { formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', { learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
@@ -163,22 +159,22 @@ var bootstrap = function ($, learun) {
}); });
} }
}, },
//{
// 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: '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: 'Grade', width: 60, align: "left" },
{
label: '学制', name: 'EduSystem', width: 100, align: "left",
label: '学制', name: 'EduSystem', width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) { formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', { learun.clientdata.getAsync('dataItem', {
key: value, key: value,
@@ -189,179 +185,192 @@ var bootstrap = function ($, learun) {
}); });
} }
}, },
//{
// label: '入班日期', name: 'LeaveDate', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '离班日期', name: 'EnteDate', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '现班级', name: 'NewClassNo', 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: 'NewMajorNo', 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: 'NewDeptNo', 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: 'NewGrade', width: 60, align: "left" },
//{
// label: '创建时间', name: 'CreateTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '创建用户', name: 'CreateUserId', width: 200, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
//},
//{
// label: '审核时间', name: 'CheckTime', width: 200, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '审核用户', name: 'CheckUserId', width: 200, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('custmerData', {
// url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
// key: value,
// keyId: 'f_userid',
// callback: function (_data) {
// callback(_data['f_realname']);
// }
// });
// }
//},
{ {
label: '入班日期', name: 'LeaveDate', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '离班日期', name: 'EnteDate', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '现班级', name: 'NewClassNo', 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: 'NewMajorNo', 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: 'NewDeptNo', 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: 'NewGrade', width: 60, align: "left" },
{
label: '创建时间', name: 'CreateTime', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '创建用户', name: 'CreateUserId', width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{
label: '审核时间', name: 'CheckTime', width: 200, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '审核用户', name: 'CheckUserId', width: 200, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('custmerData', {
url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
key: value,
keyId: 'f_userid',
callback: function (_data) {
callback(_data['f_realname']);
}
});
}
},
{
label: '审核状态', name: 'F_EnabledMark', width: 80, align: "left",
label: '审核状态', name: 'F_EnabledMark', width: 200, align: "left",
formatter: function (cellvalue) { formatter: function (cellvalue) {
return cellvalue == "1" ? "<span class=\"label label-success\">已生效</span>" : "<span class=\"label label-danger\">未生效</span>"; return cellvalue == "1" ? "<span class=\"label label-success\">已生效</span>" : "<span class=\"label label-danger\">未生效</span>";
} }
}, },
{ {
label: '是否保留学籍', name: 'StuStatus', width: 80, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'YesOrNoInt',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '是否注销账号', name: 'F_WriteMark', width: 80, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'YesOrNoInt',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '是否恢复学籍', name: 'RecoverStuStatus', width: 80, align: "left",
formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', {
key: value,
code: 'YesOrNoInt',
callback: function (_data) {
callback(_data.text);
}
});
}
},
{
label: '是否恢复账号', name: 'RecoverWriteMark', width: 80, align: "left",
label: '异动类型', name: 'AnomalousType', width: 100, align: "left",
formatterAsync: function (callback, value, row, op, $cell) { formatterAsync: function (callback, value, row, op, $cell) {
learun.clientdata.getAsync('dataItem', { learun.clientdata.getAsync('dataItem', {
key: value, key: value,
code: 'YesOrNoInt',
code: 'StuChangeType',
callback: function (_data) { callback: function (_data) {
callback(_data.text); callback(_data.text);
} }
}); });
} }
}, },
{ label: '修学年限', name: 'SuspensionPeriod', width: 200, align: "left" },
{
label: '休学开始时间', name: 'SuspensionBeginTime', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{
label: '休学结束时间', name: 'SuspensionEndTime', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{ label: '转学前学校', name: 'TransferSchool', width: 150, align: "left" },
{ label: '转学前学号', name: 'TransferStuNo', width: 100, align: "left" },
{
label: '出身日期', name: 'Birthday', width: 100, align: "left",
formatter: function (cellvalue) {
return learun.formatDate(cellvalue, 'yyyy-MM-dd');
}
},
{ label: '民族', name: 'NationalityNo', width: 80, align: "left" },
{ label: '省', name: 'Province', width: 100, align: "left" },
{ label: '市', name: 'City', width: 100, align: "left" },
{ label: '县/区', name: 'County', width: 100, align: "left" },
{ label: '联系电话', name: 'Mobile', width: 100, align: "left" },
{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" },
{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" },
{ label: '备注', name: 'Remark', width: 500, align: "left" },
//{ label: '异动原因', name: 'ChangeReason', width: 300, align: "left" },
//{
// label: '是否保留学籍', name: 'StuStatus', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否注销账号', name: 'F_WriteMark', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否恢复学籍', name: 'RecoverStuStatus', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{
// label: '是否恢复账号', name: 'RecoverWriteMark', width: 80, align: "left",
// formatterAsync: function (callback, value, row, op, $cell) {
// learun.clientdata.getAsync('dataItem', {
// key: value,
// code: 'YesOrNoInt',
// callback: function (_data) {
// callback(_data.text);
// }
// });
// }
//},
//{ label: '修学年限', name: 'SuspensionPeriod', width: 200, align: "left" },
//{
// label: '休学开始时间', name: 'SuspensionBeginTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{
// label: '休学结束时间', name: 'SuspensionEndTime', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{ label: '转学前学校', name: 'TransferSchool', width: 150, align: "left" },
//{ label: '转学前学号', name: 'TransferStuNo', width: 100, align: "left" },
//{
// label: '出身日期', name: 'Birthday', width: 100, align: "left",
// formatter: function (cellvalue) {
// return learun.formatDate(cellvalue, 'yyyy-MM-dd');
// }
//},
//{ label: '民族', name: 'NationalityNo', width: 80, align: "left" },
//{ label: '省', name: 'Province', width: 100, align: "left" },
//{ label: '市', name: 'City', width: 100, align: "left" },
//{ label: '县/区', name: 'County', width: 100, align: "left" },
//{ label: '联系电话', name: 'Mobile', width: 100, align: "left" },
//{ label: '家庭地址', name: 'MailAddress', width: 200, align: "left" },
//{ label: '转出学校', name: 'OutSchool', width: 100, align: "left" },
//{ label: '备注', name: 'Remark', width: 500, align: "left" },
], ],
mainId: 'ID', mainId: 'ID',
isPage: true, isPage: true,


+ 104
- 102
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml Visa fil

@@ -59,113 +59,115 @@
<div class="contabwrap" id="condivtab"> <div class="contabwrap" id="condivtab">


<div class="condiv divactive" id="tab1"> <div class="condiv divactive" id="tab1">
<div class="lr-layout">
<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="padding:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-form-wrap" style="height:90%;" id="form">
@*转入班级*@
<div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;padding-bottom:10px;">转入班级</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">系部<font face="宋体">*</font></div>
<div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">专业<font face="宋体">*</font></div>
<div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-2 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-2 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-2 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:18px;border-bottom:1px solid #eee;margin:20px;margin-top:120px;padding-bottom:10px;">转入学生信息</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学校</div>
<input id="TransferPreSchool" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前年级</div>
<input id="TransferPreGrade" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前班级</div>
<input id="TransferPreClass" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前专业</div>
<input id="TransferPreMajor" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学号</div>
<input id="TransferPreStuNo" type="text" class="form-control" />
</div>
<div class="col-xs-3 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-3 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-3 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-3 lr-form-item">
<div class="lr-form-item-title">证件类型<font face="宋体">*</font></div>
<div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-3 lr-form-item">
<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-3 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-3 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-3 lr-form-item">
<div class="lr-form-item-title">民族</div>
<div id="NationalityNo"></div>
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">户口所在地</div>
<input id="ResidencePlace" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">籍贯</div>
<input id="RegionNo" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">是否住宿</div>
<div id="IsInAccommodation"></div>
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">联系电话</div>
<input id="Mobile" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">家庭地址</div>
<input id="MailAddress" type="text" class="form-control" />
</div>


<div class="lr-layout-center">
<div class="lr-layout-wrap lr-layout-wrap-notitle " style="padding:15px; -webkit-scrollbar-track-piece{width:1px;background-color:#fff;}">
<div class="lr-form-wrap" style="height:90%;" id="form">
@*转入班级*@
<div style="font-size:18px;border-bottom:1px solid #eee;margin:20px;padding-bottom:10px;">转入班级</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">系部<font face="宋体">*</font></div>
<div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">专业<font face="宋体">*</font></div>
<div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-2 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-2 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-2 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:18px;border-bottom:1px solid #eee;margin:20px;margin-top:120px;padding-bottom:10px;">转入学生信息</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学校</div>
<input id="TransferPreSchool" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前年级</div>
<input id="TransferPreGrade" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前班级</div>
<input id="TransferPreClass" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前专业</div>
<input id="TransferPreMajor" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">转学前学号</div>
<input id="TransferPreStuNo" type="text" class="form-control" />
</div>
<div class="col-xs-3 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-3 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-3 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-3 lr-form-item">
<div class="lr-form-item-title">证件类型<font face="宋体">*</font></div>
<div id="IdCardType" isvalid="yes" checkexpession="NotNull"></div>
</div>
<div class="col-xs-3 lr-form-item">
<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-3 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-3 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-3 lr-form-item">
<div class="lr-form-item-title">民族</div>
<div id="NationalityNo"></div>
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">户口所在地</div>
<input id="ResidencePlace" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">籍贯</div>
<input id="RegionNo" type="text" class="form-control" />
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">是否住宿</div>
<div id="IsInAccommodation"></div>
</div>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">联系电话</div>
<input id="Mobile" type="text" class="form-control" />
</div>
<div class="col-xs-3 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 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>
</div> </div>

</div> </div>


</div> </div>


+ 8
- 8
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml Visa fil

@@ -78,19 +78,19 @@
</div> </div>
</div>*@ </div>*@
<div class="lr-form-wrap" style="height:30%;" id="form"> <div class="lr-form-wrap" style="height:30%;" id="form">
<div class="col-xs-4 lr-form-item">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">系部<font face="宋体">*</font></div> <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
<div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div> <div id="NewDeptNo" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
<div class="col-xs-4 lr-form-item">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">专业<font face="宋体">*</font></div> <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
<div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div> <div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
<div class="col-xs-4 lr-form-item">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">年级<font face="宋体">*</font></div> <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
<div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> <div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
<div class="col-xs-4 lr-form-item">
<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">班级<font face="宋体">*</font></div> <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
<div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div> <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
@@ -102,14 +102,14 @@
<div class="lr-form-item-title">离班日期<font face="宋体">*</font></div> <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" /> <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 class="col-xs-6 lr-form-item">
<div class="col-xs-4 lr-form-item">
<div class="lr-form-item-title">异动类型<font face="宋体">*</font></div> <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
<div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
</div> </div>
<div class="col-xs-6 lr-form-item">
@*<div class="col-xs-6 lr-form-item">
<div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div> <div class="lr-form-item-title">保留学籍<font face="宋体">*</font></div>
<div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div> <div id="StuStatus" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
</div>
</div>*@
<div class="col-xs-12 lr-form-item"> <div class="col-xs-12 lr-form-item">
<div class="lr-form-item-title">异动原因</div> <div class="lr-form-item-title">异动原因</div>
<textarea id="Remark" class="form-control" style="height: 100px;"></textarea> <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>


+ 13
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js Visa fil

@@ -234,8 +234,19 @@ var bootstrap = function ($, learun) {
value: "classno", value: "classno",
text: "classname" text: "classname"
}); });
$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
$('#AnomalousType').lrselectSet("01");
//$('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
//$('#AnomalousType').lrselectSet("01");
$('#AnomalousType').lrselect({
url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailList3',
param: { itemCode: 'StuChangeType', strWhere: "and( F_ItemValue='01' or F_ItemValue='07'or F_ItemValue='08') order by F_ItemValue desc" },
value: "F_ItemValue",
text: "F_ItemName"
//nodeClick: function (item) {
// type = item.value;
// $('#titleinfo').text(item.text);
// page.search();
//}
});
$('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });


// 刷新 // 刷新


+ 84
- 76
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml Visa fil

@@ -59,96 +59,104 @@


<div class="contabwrap" id="condivtab"> <div class="contabwrap" id="condivtab">
<div class="condiv divactive" id="tab1"> <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 class="lr-layout">
<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>
</div> </div>
</div> </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 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> </div>
</div> </div>
</div>
<div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>
<div class="lr-layout-body" style="height:50%;border-bottom:1px solid #ccc;" id="gridtable"></div>


<div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
<div class="lr-form-wrap" style="height:30%;" id="form">
<div class="col-xs-2 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" readonly="readonly"></div>
</div>
<div class="col-xs-2 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>
<div class="col-xs-2 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>
<div class="col-xs-2 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>
<div class="col-xs-2 lr-form-item">
<div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
<input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-2 lr-form-item" >
<div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
<input id="SuspensionBeginTime" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
<div class="lr-layout-body" style="height:40%;border-bottom:1px solid #ccc;border-top: 1px solid #ccc;margin-top:50px;" id="selgridtab"></div>
<div class="lr-form-wrap" style="height:30%;" id="form">
<div class="col-xs-2 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" readonly="readonly"></div>
</div>
<div class="col-xs-2 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>
<div class="col-xs-2 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>
<div class="col-xs-3 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>
<div class="col-xs-3 lr-form-item">
<div class="lr-form-item-title">休学年限<font face="宋体">*</font></div>
<input id="SuspensionPeriod" class="form-control" type="text" isvalid="yes" checkexpession="NotNull" />
</div>
<div class="col-xs-2 lr-form-item">
<div class="lr-form-item-title">休学时段<font face="宋体">*</font></div>
<input id="SuspensionBeginTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({maxDate:'#F{$dp.$D(\'SuspensionEndTime\',{d:-3});}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionBeginTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />


</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>
</div>
<div class="col-xs-2 lr-form-item" style="padding-left:25px;">
<div class="lr-form-item-title" style="width:25px;">至<font face="宋体">*</font></div>
<input id="SuspensionEndTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({minDate:'#F{$dp.$D(\'SuspensionBeginTime\',{d:3})}', dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#SuspensionEndTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />


</div>
</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>


<div id="SubmitBtn" 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 id="SubmitBtn" 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>
</div> </div>

</div> </div>


</div> </div>


+ 13
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js Visa fil

@@ -19,10 +19,23 @@ var bootstrap = function ($, learun) {
} }
}) })
$('#SubmitBtn').on('click', function () { $('#SubmitBtn').on('click', function () {
if (!$('body').lrValidform()) { if (!$('body').lrValidform()) {
return false; return false;
} }
var entity = $('body').lrGetFormData(); var entity = $('body').lrGetFormData();
let starttime = new Date(entity.SuspensionBeginTime).getTime();
let endtime = new Date(entity.SuspensionEndTime).getTime();
if (endtime < starttime) {
learun.alert.warning("起始日期不能大于终止日期！");
return false;
}

if (parseInt(Math.abs(endtime - starttime) / 1000 / 60 / 60 / 24) < 183) {
learun.alert.warning("起始时间与终止时间不能小于半年！");
return false;
}
var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
function (res) { function (res) {


+ 19
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs Visa fil

@@ -44,7 +44,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public ActionResult ClassifyIndex() {
public ActionResult ClassifyIndex()
{
return View(); return View();
} }
/// <summary> /// <summary>
@@ -100,7 +101,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]
[AjaxOnly] [AjaxOnly]
public ActionResult SaveClassifyForm(string keyValue, DataItemEntity entity) {
public ActionResult SaveClassifyForm(string keyValue, DataItemEntity entity)
{
dataItemIBLL.SaveClassifyEntity(keyValue, entity); dataItemIBLL.SaveClassifyEntity(keyValue, entity);
return Success("保存成功！"); return Success("保存成功！");
} }
@@ -111,7 +113,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[AjaxOnly] [AjaxOnly]
public ActionResult DeleteClassifyForm(string keyValue) {
public ActionResult DeleteClassifyForm(string keyValue)
{
dataItemIBLL.VirtualDeleteClassify(keyValue); dataItemIBLL.VirtualDeleteClassify(keyValue);
return Success("删除成功！"); return Success("删除成功！");
} }
@@ -173,6 +176,19 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers
return JsonResult(data); return JsonResult(data);
} }
/// <summary> /// <summary>
/// 获取数据字典明显根据分类编号 +条件
/// </summary>
/// <param name="itemCode"></param>
/// <param name="strWhere">条件</param>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetDetailList3(string itemCode, string strWhere)
{
var data = dataItemIBLL.GetDetailList3(itemCode, strWhere);
return JsonResult(data);
}
/// <summary>
/// 获取数据字典明显树形数据 /// 获取数据字典明显树形数据
/// </summary> /// </summary>
/// <param name="itemCode">分类编号</param> /// <param name="itemCode">分类编号</param>


+ 26
- 0
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs Visa fil

@@ -324,6 +324,32 @@ namespace Learun.Application.Base.SystemModule
} }
} }
} }

/// <summary>
/// 获取数据字典明显根据分类编号 +条件
/// </summary>
/// <param name="itemCode"></param>
/// <param name="StrWhere"></param>
/// <returns></returns>
public List<DataItemDetailEntity> GetDetailList3(string itemCode, string StrWhere)
{
try
{
List<DataItemDetailEntity> list = (List<DataItemDetailEntity>)dataItemService.GetDetailList3(itemCode, StrWhere);
return list;
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}
public IEnumerable<DataItemDetailEntity> GetAllDetailList() public IEnumerable<DataItemDetailEntity> GetAllDetailList()
{ {
try try


+ 7
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs Visa fil

@@ -85,7 +85,13 @@ namespace Learun.Application.Base.SystemModule
/// <param name="keyword">关键词（名称/值）</param> /// <param name="keyword">关键词（名称/值）</param>
/// <returns></returns> /// <returns></returns>
List<DataItemDetailEntity> GetDetailList2(string itemCode, string keyword); List<DataItemDetailEntity> GetDetailList2(string itemCode, string keyword);

/// <summary>
/// 获取数据字典明显根据分类编号 +条件
/// </summary>
/// <param name="itemCode"></param>
/// <param name="StrWhere"></param>
/// <returns></returns>
List<DataItemDetailEntity> GetDetailList3(string itemCode, string StrWhere);
/// <summary> /// <summary>
/// 获取数据字典详细映射数据 /// 获取数据字典详细映射数据
/// </summary> /// </summary>


+ 38
- 3
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs Visa fil

@@ -121,7 +121,8 @@ namespace Learun.Application.Base.SystemModule
/// </summary> /// </summary>
/// <param name="keyValue">主键</param> /// <param name="keyValue">主键</param>
/// <param name="entity">实体</param> /// <param name="entity">实体</param>
public void SaveClassifyEntity(string keyValue, DataItemEntity entity) {
public void SaveClassifyEntity(string keyValue, DataItemEntity entity)
{
try try
{ {
if (string.IsNullOrEmpty(keyValue)) if (string.IsNullOrEmpty(keyValue))
@@ -129,7 +130,8 @@ namespace Learun.Application.Base.SystemModule
entity.Create(); entity.Create();
this.BaseRepository().Insert(entity); this.BaseRepository().Insert(entity);
} }
else {
else
{
entity.Modify(keyValue); entity.Modify(keyValue);
this.BaseRepository().Update(entity); this.BaseRepository().Update(entity);
} }
@@ -238,11 +240,44 @@ namespace Learun.Application.Base.SystemModule
} }
} }
/// <summary> /// <summary>
/// 获取数据字典明显根据分类编号 +条件
/// </summary>
/// <param name="itemCode"></param>
/// <param name="strWhere"></param>
/// <returns></returns>
public IEnumerable<DataItemDetailEntity> GetDetailList3(string itemCode, string strWhere)
{
try
{
StringBuilder strSql = new StringBuilder();
strSql.Append(" SELECT " + detailFieldSql + @" FROM LR_Base_DataItemDetail t
INNER JOIN LR_Base_DataItem t2 ON t.F_ItemId = t2.F_ItemId
WHERE t2.F_ItemCode = @itemCode AND t.F_DeleteMark = 0 ");
if (!string.IsNullOrEmpty(strWhere))
{
strSql.Append(strWhere);
}
return this.BaseRepository().FindList<DataItemDetailEntity>(strSql.ToString(), new { itemCode = itemCode });
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}
/// <summary>
/// 获取数据字典明细实体类 /// 获取数据字典明细实体类
/// </summary> /// </summary>
/// <param name="keyValue">主键</param> /// <param name="keyValue">主键</param>
/// <returns></returns> /// <returns></returns>
public DataItemDetailEntity GetDetailEntity(string keyValue) {
public DataItemDetailEntity GetDetailEntity(string keyValue)
{
try try
{ {
return this.BaseRepository().FindEntity<DataItemDetailEntity>(keyValue); return this.BaseRepository().FindEntity<DataItemDetailEntity>(keyValue);


+ 3
- 2
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs Visa fil

@@ -352,7 +352,7 @@ where a.EPId='{EPId}'");
var addSql = $@"insert into Exam_ExamPlanClass var addSql = $@"insert into Exam_ExamPlanClass
SELECT NEWID(),'{lesson.EPLId}',c.ClassName,t.ClassNo,count(1) as StuNum FROM Exam_ExamStudent t SELECT NEWID(),'{lesson.EPLId}',c.ClassName,t.ClassNo,count(1) as StuNum FROM Exam_ExamStudent t
left join classinfo c on t.ClassNo=c.ClassNo WHERE t.ESEnabled=1 and t.AcademicYearNo='{examPlan.AcademicYearNo}' and t.Semester='{examPlan.Semester}' and t.Grade='{lesson.Grade}' left join classinfo c on t.ClassNo=c.ClassNo WHERE t.ESEnabled=1 and t.AcademicYearNo='{examPlan.AcademicYearNo}' and t.Semester='{examPlan.Semester}' and t.Grade='{lesson.Grade}'
and t.ESType='{examPlan.PlanType}' and c.majorno='{lesson.TeachMajorNo}'
and t.ESType='{examPlan.PlanType}' and c.majorno='{lesson.TeachMajorNo}' and (t.ClassNo is not null and len(t.ClassNo)>0)
and t.ClassNo not in (select ClassNo from [dbo].[Exam_ExamPlanClass] where EPLId='{lesson.EPLId}') and t.ClassNo not in (select ClassNo from [dbo].[Exam_ExamPlanClass] where EPLId='{lesson.EPLId}')
group by t.ClassNo,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName "; group by t.ClassNo,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName ";
db.ExecuteBySql(addSql); db.ExecuteBySql(addSql);
@@ -363,7 +363,8 @@ and t.ESType='{examPlan.PlanType}' and c.majorno='{lesson.TeachMajorNo}'
var addSql = $@"insert into Exam_ExamPlanClass var addSql = $@"insert into Exam_ExamPlanClass
SELECT NEWID(),'{lesson.EPLId}',c.ClassName,t.ClassNo,count(1) as StuNum FROM Exam_ExamStudent t SELECT NEWID(),'{lesson.EPLId}',c.ClassName,t.ClassNo,count(1) as StuNum FROM Exam_ExamStudent t
left join classinfo c on t.ClassNo=c.ClassNo WHERE t.ESEnabled=1 and t.AcademicYearNo='{examPlan.AcademicYearNo}' and t.Semester='{examPlan.Semester}' and t.ESType='{examPlan.PlanType}' and t.Grade='{lesson.Grade}' left join classinfo c on t.ClassNo=c.ClassNo WHERE t.ESEnabled=1 and t.AcademicYearNo='{examPlan.AcademicYearNo}' and t.Semester='{examPlan.Semester}' and t.ESType='{examPlan.PlanType}' and t.Grade='{lesson.Grade}'
and t.ClassNo not in (select ClassNo from [dbo].[Exam_ExamPlanClass] where EPLId='{lesson.EPLId}')
and (t.ClassNo is not null and len(t.ClassNo)>0)
and t.ClassNo not in (select ClassNo from [dbo].[Exam_ExamPlanClass] where EPLId='{lesson.EPLId}')
group by t.ClassNo,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName "; group by t.ClassNo,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName ";
db.ExecuteBySql(addSql); db.ExecuteBySql(addSql);
} }


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs Visa fil

@@ -94,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
strSql.Append(@" t.ClassNo,count(1) as StuNum,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName "); strSql.Append(@" t.ClassNo,count(1) as StuNum,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName ");
strSql.Append(" FROM Exam_ExamStudent t "); strSql.Append(" FROM Exam_ExamStudent t ");
strSql.Append(" left join classinfo c on t.ClassNo=c.ClassNo "); strSql.Append(" left join classinfo c on t.ClassNo=c.ClassNo ");
strSql.Append(" WHERE t.ESEnabled=1 ");
strSql.Append(" WHERE t.ESEnabled=1 and (t.ClassNo is not null and len(t.ClassNo)>0) ");
var queryParam = queryJson.ToJObject(); var queryParam = queryJson.ToJObject();
// 虚拟参数 // 虚拟参数
var dp = new DynamicParameters(new { }); var dp = new DynamicParameters(new { });


Skriv Förhandsgranska
Laddar…
Avbryt
Spara