From 0d026a879be91157f5dc094235cdb0ad142c167d Mon Sep 17 00:00:00 2001 From: ndbs Date: Thu, 2 Feb 2023 18:18:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86,=E5=AD=A6=E7=B1=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/CheckIndex.cshtml | 1 + .../Views/StuTransferInfo/CheckIndex.js | 18 + .../Views/StuTransferInfo/FormView.cshtml | 4 +- .../Views/StuTransferInfo/Index.js | 385 +++++++++--------- 4 files changed, 218 insertions(+), 190 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml index 4f91debc3..2903d36c5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.cshtml @@ -50,6 +50,7 @@  审核  删除  打印 +  查看 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js index 296aa8a4c..bd8c60e57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js @@ -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 () { $('#gridtable').lrAuthorizeJfGridLei({ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml index d88cfa2fb..4d83d3966 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml @@ -96,8 +96,8 @@
-
审核意见
- +
备注
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js index 71426ddf3..53047db49 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js @@ -105,6 +105,10 @@ 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: '查看', @@ -121,24 +125,16 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList', headData: [ { 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) { learun.clientdata.getAsync('custmerData', { 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) { learun.clientdata.getAsync('custmerData', { 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) { learun.clientdata.getAsync('dataItem', { 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) { return cellvalue == "1" ? "已生效" : "未生效"; } }, { - 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) { learun.clientdata.getAsync('dataItem', { key: value, - code: 'YesOrNoInt', + code: 'StuChangeType', 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" }, + //{ 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', isPage: true, From cad85d653301d99665d23402d5d84db7c75c8ecc Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 3 Feb 2023 09:49:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exam_ExamPlanClass/Exam_ExamPlanClassService.cs | 5 +++-- .../Exam_ExamStudent/Exam_ExamStudentService.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs index 14cb72eed..8a3befa7b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs @@ -352,7 +352,7 @@ where a.EPId='{EPId}'"); var addSql = $@"insert into Exam_ExamPlanClass 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}' -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}') group by t.ClassNo,t.AcademicYearNo,t.Semester,t.ESType,c.ClassName "; db.ExecuteBySql(addSql); @@ -363,7 +363,8 @@ and t.ESType='{examPlan.PlanType}' and c.majorno='{lesson.TeachMajorNo}' var addSql = $@"insert into Exam_ExamPlanClass 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}' - 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 "; db.ExecuteBySql(addSql); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs index bad441961..0f299888d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamStudent/Exam_ExamStudentService.cs @@ -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(" FROM Exam_ExamStudent t "); 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 dp = new DynamicParameters(new { }); From 390d93893fd13c85002244f0bfae29c431cf204a Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 3 Feb 2023 14:10:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BB=91=E5=AE=9A=20?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=BC=96=E5=8F=B7=20+=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DataItemController.cs | 22 ++++++++-- .../SystemModule/DataItem/DataItemBLL.cs | 26 ++++++++++++ .../SystemModule/DataItem/DataItemIBLL.cs | 8 +++- .../SystemModule/DataItem/DataItemService.cs | 41 +++++++++++++++++-- 4 files changed, 90 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs index de0fe52d1..10a5c43df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/DataItemController.cs @@ -44,7 +44,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers /// /// [HttpGet] - public ActionResult ClassifyIndex() { + public ActionResult ClassifyIndex() + { return View(); } /// @@ -100,7 +101,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers [HttpPost] [ValidateAntiForgeryToken] [AjaxOnly] - public ActionResult SaveClassifyForm(string keyValue, DataItemEntity entity) { + public ActionResult SaveClassifyForm(string keyValue, DataItemEntity entity) + { dataItemIBLL.SaveClassifyEntity(keyValue, entity); return Success("保存成功!"); } @@ -111,7 +113,8 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers /// [HttpPost] [AjaxOnly] - public ActionResult DeleteClassifyForm(string keyValue) { + public ActionResult DeleteClassifyForm(string keyValue) + { dataItemIBLL.VirtualDeleteClassify(keyValue); return Success("删除成功!"); } @@ -173,6 +176,19 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers return JsonResult(data); } /// + /// 获取数据字典明显根据分类编号 +条件 + /// + /// + /// 条件 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetDetailList3(string itemCode, string strWhere) + { + var data = dataItemIBLL.GetDetailList3(itemCode, strWhere); + return JsonResult(data); + } + /// /// 获取数据字典明显树形数据 /// /// 分类编号 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs index f4293a4d1..fd575ada8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemBLL.cs @@ -324,6 +324,32 @@ namespace Learun.Application.Base.SystemModule } } } + + /// + /// 获取数据字典明显根据分类编号 +条件 + /// + /// + /// + /// + public List GetDetailList3(string itemCode, string StrWhere) + { + try + { + List list = (List)dataItemService.GetDetailList3(itemCode, StrWhere); + return list; + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } public IEnumerable GetAllDetailList() { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs index a6255d2a7..5663aa472 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemIBLL.cs @@ -85,7 +85,13 @@ namespace Learun.Application.Base.SystemModule /// 关键词(名称/值) /// List GetDetailList2(string itemCode, string keyword); - + /// + /// 获取数据字典明显根据分类编号 +条件 + /// + /// + /// + /// + List GetDetailList3(string itemCode, string StrWhere); /// /// 获取数据字典详细映射数据 /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs index 2f965041b..84dae8858 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/DataItem/DataItemService.cs @@ -121,7 +121,8 @@ namespace Learun.Application.Base.SystemModule /// /// 主键 /// 实体 - public void SaveClassifyEntity(string keyValue, DataItemEntity entity) { + public void SaveClassifyEntity(string keyValue, DataItemEntity entity) + { try { if (string.IsNullOrEmpty(keyValue)) @@ -129,7 +130,8 @@ namespace Learun.Application.Base.SystemModule entity.Create(); this.BaseRepository().Insert(entity); } - else { + else + { entity.Modify(keyValue); this.BaseRepository().Update(entity); } @@ -238,11 +240,44 @@ namespace Learun.Application.Base.SystemModule } } /// + /// 获取数据字典明显根据分类编号 +条件 + /// + /// + /// + /// + public IEnumerable 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(strSql.ToString(), new { itemCode = itemCode }); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取数据字典明细实体类 /// /// 主键 /// - public DataItemDetailEntity GetDetailEntity(string keyValue) { + public DataItemDetailEntity GetDetailEntity(string keyValue) + { try { return this.BaseRepository().FindEntity(keyValue); From 99ec973fb80cf89327c29f827911e628fc91aac9 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 3 Feb 2023 14:37:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=20?= =?UTF-8?q?=E8=BD=AC=E4=B8=93=E4=B8=9A=E4=B8=8B=E6=8B=89=E6=A1=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/MajorIndex.cshtml | 2 +- .../Views/StuTransferInfo/MajorIndex.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml index 1c531168b..c0e4a888b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml @@ -104,7 +104,7 @@
异动类型*
-
+
保留学籍*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js index 43eff40b3..62cf61a6d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js @@ -234,8 +234,19 @@ var bootstrap = function ($, learun) { value: "classno", 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' }); // 刷新 From 3c4de5e9fa7598dbd4c4976b8657ee11530f1ac4 Mon Sep 17 00:00:00 2001 From: ndbs Date: Fri, 3 Feb 2023 17:01:36 +0800 Subject: [PATCH 5/8] --- .../Views/StuTransferInfo/MajorIndex.cshtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml index c0e4a888b..7f6e6207f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.cshtml @@ -78,19 +78,19 @@
*@
-
+
系部*
-
+
专业*
-
+
年级*
-
+
班级*
@@ -102,14 +102,14 @@
离班日期*
-
+
异动类型*
-
+ @*
保留学籍*
-
+
*@
异动原因
From cd05a5ebcafe6ec093efa85a6fd95ea81639c9a0 Mon Sep 17 00:00:00 2001 From: ndbs Date: Sat, 4 Feb 2023 16:43:56 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/Index.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js index 53047db49..261b8457c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js @@ -18,13 +18,13 @@ var bootstrap = function ($, learun) { var modulesTree = learun.clientdata.get(['modulesTree']); $('#changeMajor').on('click', function () { let item = modulesTree[0].filter(item => { -   return item.F_FullName == "教务信息管理" - }) + return item.F_FullName == "教务信息管理" + }) 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 => { - return item.F_FullName == "转专业" + return item.F_EnCode == "MajorIndex"// "转专业" }) learun.frameTab.open(moduleitem[0]); }) @@ -33,10 +33,10 @@ var bootstrap = function ($, learun) { return item.F_FullName == "教务信息管理" }) 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 => { - return item.F_FullName == "休学复学" + return item.F_EnCode == "RestAgain"// "休学复学" }) learun.frameTab.open(moduleitem[0]); }) @@ -45,10 +45,10 @@ var bootstrap = function ($, learun) { return item.F_FullName == "教务信息管理" }) 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 => { - return item.F_FullName == "退学异动" + return item.F_EnCode == "DropOut"// "退学异动" }) learun.frameTab.open(moduleitem[0]); }) @@ -57,10 +57,10 @@ var bootstrap = function ($, learun) { return item.F_FullName == "教务信息管理" }) 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 => { - return item.F_FullName == "转入转出异动" + return item.F_EnCode == "InAndOut" //"转入转出异动" }) learun.frameTab.open(moduleitem[0]); }) @@ -69,10 +69,10 @@ var bootstrap = function ($, learun) { return item.F_FullName == "教务信息管理" }) 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 => { - return item.F_FullName == "学籍异动审核" + return item.F_EnCode == "CheckIndex" //"学籍异动审核" }) learun.frameTab.open(moduleitem[0]); }) From c055ebb68f2e01466b7f8530c6e79d9f7cb88f20 Mon Sep 17 00:00:00 2001 From: libo Date: Sat, 4 Feb 2023 16:47:36 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=91=E5=AD=A6=E6=97=B6=E6=AE=B5=20=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/RestAgainIndex.cshtml | 13 +++++++++---- .../Views/StuTransferInfo/RestAgainIndex.js | 13 +++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml index 7db8c18e7..7a9bf07d6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml @@ -124,17 +124,22 @@
保留学籍*
-
+
离班日期*
-
+
休学年限*
-
+
休学时段*
- + + +
+
+
*
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js index 7b09fbff7..cfb8642af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js @@ -19,10 +19,23 @@ var bootstrap = function ($, learun) { } }) $('#SubmitBtn').on('click', function () { + if (!$('body').lrValidform()) { return false; } 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'); $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, function (res) { From c595fed2cbf81b2697d8e9c00f57d8f4d3f47b85 Mon Sep 17 00:00:00 2001 From: libo Date: Sat, 4 Feb 2023 17:51:46 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BD=AC=E5=85=A5=E8=BD=AC=E5=87=BA?= =?UTF-8?q?=E5=92=8C=E4=BC=91=E5=AD=A6=E5=A4=8D=E5=AD=A6=20=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/IntoIndex.cshtml | 206 +++++++++--------- .../StuTransferInfo/RestAgainIndex.cshtml | 163 +++++++------- 2 files changed, 187 insertions(+), 182 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml index 1c9727663..0206ab659 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.cshtml @@ -59,113 +59,115 @@
+
+
+
+
+ @*转入班级*@ +
转入班级
+
+
系部*
+
+
+
+
专业*
+
+
+
+
年级*
+
+
+
+
班级*
+
+
+
+
入班日期*
+ +
+ @*转入学生信息*@ +
转入学生信息
+
+
转学前学校
+ +
+
+
转学前年级
+ +
+
+
转学前班级
+ +
+
+
转学前专业
+ +
+
+
转学前学号
+ +
+
+
转学日期
+ +
+
+
姓名*
+ +
+
+
学号*
+ +
+
+
证件类型*
+
+
+
+
证件号码*
+ +
+
+
出生日期
+ +
+
+
性别*
+
+
+
+
民族
+
+
+
+
户口所在地
+ +
+
+
籍贯
+ +
+
+
是否住宿
+
+
+
+
联系电话
+ +
+
+
家庭地址
+ +
-
-
-
- @*转入班级*@ -
转入班级
-
-
系部*
-
-
-
专业*
-
-
-
-
年级*
-
-
-
-
班级*
-
-
-
-
入班日期*
- -
- @*转入学生信息*@ -
转入学生信息
-
-
转学前学校
- -
-
-
转学前年级
- -
-
-
转学前班级
- -
-
-
转学前专业
- -
-
-
转学前学号
- -
-
-
转学日期
- -
-
-
姓名*
- -
-
-
学号*
- -
-
-
证件类型*
-
-
-
-
证件号码*
- -
-
-
出生日期
- -
-
-
性别*
-
-
-
-
民族
-
-
-
-
户口所在地
- -
-
-
籍贯
- -
-
-
是否住宿
-
-
-
-
联系电话
- -
-
-
家庭地址
- -
- -
-
- 提交 +
+ 提交 +
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml index 7a9bf07d6..b201165b8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml @@ -59,101 +59,104 @@
-
-
-
-
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- +
+
+
+
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学生编号
+ +
+
+
学籍号
+ +
-
-
-
- +
+
+ +
-
-
+
-
-
-
-
异动类型*
-
-
-
-
注销账号*
-
-
-
-
保留学籍*
-
-
-
-
离班日期*
- -
-
-
休学年限*
- -
-
-
休学时段*
- +
+
+
+
异动类型*
+
+
+
+
注销账号*
+
+
+
+
保留学籍*
+
+
+
+
离班日期*
+ +
+
+
休学年限*
+ +
+
+
休学时段*
+ -
-
-
*
- +
+
+
*
+ -
-
-
异动原因
- -
+
+
+
异动原因
+ +
-
+
-
+
提交
+
+