From 4bf26838378817f14458f18273db608aebfb8f36 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 1 Feb 2023 15:12:30 +0800 Subject: [PATCH 1/2] =?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 --- .../Views/Exam_ExamPlan/Index.js | 1 + .../Views/Exam_ExamPlanLesson/FormClass.js | 2 +- .../Views/Exam_ExamTeacherTime/Index.js | 7 ------- .../Exam_ExamLesson/Exam_ExamLessonService.cs | 2 +- .../Exam_ExamPlanClass/Exam_ExamPlanClassService.cs | 9 +++++++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js index cbae5c463..bf7f590c3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -294,6 +294,7 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamTeacherTime/Index', width: 1000, height: 600, + btn: null, callBack: function (id) { return top[id].acceptClick(refreshGirdData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js index 4c35a6d24..6ff6da698 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js @@ -92,7 +92,7 @@ var bootstrap = function ($, learun) { page.search(); }; // 保存数据 - acceptClick = function (callBack,i) { + acceptClick = function (callBack, i) { var selectedRow = $('#gridtable').jfGridGet('rowdata'); if (selectedRow.length == 0) { return learun.alert.warning("请选择班级！"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js index 1b051e06c..0d3fd98d1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Index.js @@ -4,7 +4,6 @@ * 日 期：2022-06-13 15:41 * 描 述：老师时间管理 */ -var acceptClick; var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; @@ -143,11 +142,5 @@ var bootstrap = function ($, learun) { refreshGirdData = function () { $('#gridtable').jfGridSet('reload'); }; - acceptClick = function(callBack) { - if (!!callBack) { - learun.layerClose(window.name); - callBack(); - } - }; page.init(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs index 9c701d454..e07b9e48d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs @@ -266,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[LessonNo] ,[ELOrder] ,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo) -select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t +select NEWID(),AcademicYearNo,t.Semester,replace(Grade,'级','') Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t left join lessoninfo a on t.lessonno=a.lessonno where t.ExamType='1' and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}' and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ) 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 84ce9608a..14cb72eed 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 @@ -265,6 +265,15 @@ and examtime is not null and datediff(day, examdate, '{examPlanLesson.ExamDate}' //{ // entity.ClassStuNum = stuinfo.Count(x => x.ClassNo == entity.ClassNo); //} + var classList = this.BaseRepository("CollegeMIS").FindList(x => x.CheckMark == true); + if (list.Exists(x => string.IsNullOrEmpty(x.ClassName))) + { + foreach (var item in list.Where(x => string.IsNullOrEmpty(x.ClassName)).ToList()) + { + item.ClassName = classList.Where(x => x.ClassNo == item.ClassNo).FirstOrDefault().ClassName; + } + } + this.BaseRepository("CollegeMIS").Insert(list); //更新排考安排课程表实排班级数、实排人数 //排考安排课程表Id From a1b72b73a14b74434407f1f5e9e2957910517773 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Wed, 1 Feb 2023 15:50:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=85=A5=E3=80=81=E8=BD=AC=E5=87=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuTransferInfo/IntoIndex.cshtml | 160 +++-- .../Views/StuTransferInfo/IntoIndex.js | 667 +----------------- .../Views/StuTransferInfo/RolloffIndex.cshtml | 24 +- .../Views/StuTransferInfo/RolloffIndex.js | 21 +- .../StuTransferInfo/StuTransferInfoService.cs | 2 +- 5 files changed, 155 insertions(+), 719 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 3ab3ef1ad..6e82e5f56 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 @@ -61,93 +61,109 @@
-
-
-
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学生编号
- -
-
-
学籍号
- -
-
-
-
- - @*
-
- 点击 -
-
*@ +
+
+ @*转入班级*@ +
转入班级
+
+
系部*
+
-
-
- -
+
+
专业*
+
-
-
- -
-
+
+
年级*
+
+
+
+
班级*
+
+
+
+
入班日期*
+ +
+ @*转入学生信息*@ +
转入学生信息
-
异动类型*
-
+
转学前学校
+
-
注销账号*
-
+
转学前年级
+
-
保留学籍*
-
+
转学前班级
+
-
离班日期*
- +
转学前专业
+
-
-
异动原因
- +
+
转学前学号
+ +
+
+
转学日期
+ +
+
+
姓名*
+ +
+
+
学号*
+
-
休学年限*
- +
证件类型*
+
-
休学时段(文本框暂时)*
- - @**@ +
证件号码*
+
+
+
出生日期
+ +
+
+
性别*
+
+
+
+
民族
+
+
+
+
户口所在地
+ +
+
+
籍贯
+ +
+
+
是否住宿
+
+
+
+
联系电话
+ +
+
+
家庭地址
+ +
+ +
+ +
+ 提交
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js index b2062750b..1195e29dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/IntoIndex.js @@ -6,11 +6,10 @@ var bootstrap = function ($, learun) { "use strict"; var page = { init: function () { - page.initGird(); page.bind(); }, bind: function () { - + //选项卡切换 $('#navultab li').on('click', function () { if (!$(this).hasClass('active')) { $(this).parent().find('.active').removeClass('active'); @@ -18,28 +17,24 @@ var bootstrap = function ($, learun) { $('#condivtab .condiv').eq($(this).index()).siblings().hide() $('#condivtab .condiv').eq($(this).index()).show() } - }) - - $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { - page.search(queryJson); - }, 280, 400); - + }); + //转出 $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/RolloffIndex"); - - $('#DeptNo').lrselect({ + //提交下拉框 + $('#NewDeptNo').lrselect({ allowSearch: true, value: "deptno", text: "deptname", url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', select: function (item) { if (item) { - $('#MajorNo').lrselectRefresh({ + $('#NewMajorNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } }); } else { - $('#MajorNo').lrselectRefresh({ + $('#NewMajorNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', param: { strWhere: "1=1 AND CheckMark=1" } @@ -48,23 +43,23 @@ var bootstrap = function ($, learun) { } }); - $('#MajorNo').lrselect({ + $('#NewMajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', value: "majorno", text: "majorname", param: { strWhere: "1=1 AND CheckMark=1" }, select: function (item) { - var Grades = $("#Grade").lrselectGet(); + var Grades = $("#NewGrade").lrselectGet(); if (Grades != null && Grades != "" && Grades != "undefined") { if (item) { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" } }); } else { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } @@ -72,13 +67,13 @@ var bootstrap = function ($, learun) { } } else { if (item) { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } }); } else { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } @@ -87,15 +82,15 @@ var bootstrap = function ($, learun) { } } }); - $('#Grade').lrselect({ + $('#NewGrade').lrselect({ url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', value: "value", text: "text", select: function (item) { - var MajorNos = $("#MajorNo").lrselectGet(); + var MajorNos = $("#NewMajorNo").lrselectGet(); if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { if (item) { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { @@ -103,7 +98,7 @@ var bootstrap = function ($, learun) { } }); } else { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } @@ -111,7 +106,7 @@ var bootstrap = function ($, learun) { } } else { if (item) { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { @@ -119,7 +114,7 @@ var bootstrap = function ($, learun) { } }); } else { - $('#ClassNo').lrselectRefresh({ + $('#NewClassNo').lrselectRefresh({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } @@ -129,624 +124,38 @@ var bootstrap = function ($, learun) { } }); - $('#ClassNo').lrselect({ + $('#NewClassNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, value: "classno", text: "classname" }); - //提交下拉框 - - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); - $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - //查看 - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); - if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行查看！"); - return; - } - learun.layerForm({ - id: 'form', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, - width: 1162, - height: 600, - btn: null - }); + $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); + $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); + $('#IsInAccommodation').lrDataItemSelect({ code: 'YesOrNoInt' }); + // 提交 + $('#subbtn').on('click', function () { + if (!$('body').lrValidform()) { + return false; } - }); - $('#selgridtab').jfGrid({ - headData: [ - //{ - // label: "审核状态", name: "CheckMark", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "已审核" : "未审核"; - // } - //}, - { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, }, - { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, }, - { label: "学号", name: "ProvinceCode", width: 100, align: "left" }, - { label: "姓名", name: "StuName", width: 100, align: "left" }, - { - label: "性别", name: "GenderNo", width: 80, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "男" : "女"; - } - }, - { - label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, - formatter: function (value) { - return learun.formatDate(value, 'yyyy-MM-dd'); - } - }, - { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, - { - label: "民族", name: "NationalityNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'National', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - //{ - // label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'PolityStatus', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - { label: "年级", name: "Grade", width: 100, align: "left" }, - { - label: "系所", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, - { - label: "专业", name: "MajorNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', - key: value, - keyId: 'majorno', - callback: function (_data) { - callback(_data['majorname']); - } - }); - } - }, - { - label: "班级", name: "ClassNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', - key: value, - keyId: 'classno', - callback: function (_data) { - callback(_data['classname']); - } - }); - } - }, - { - label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'EduSystem', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - //{ - // label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'QRCodeHealthStatus', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StudyModality', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, - //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" }, - //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, - //{ label: "余额", name: "Balance", width: 100, align: "left" }, - { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, - { label: "联系电话", name: "mobile", width: 100, align: "left" }, - { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, - { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, - { - label: "操作", name: "Delete", width: 100, align: "center", - formatter: function (callback, cellvalue, row, op, $cell) { - var $div = $('
'); - var $hbtn = $(' 移除'); - $hbtn.on('click', function () { - tempdatra.map((item, index) => { - if (item.StuNo == cellvalue.StuNo) { - tempdatra.splice(index, 1) - } - }); - //console.log(tempdatra) - $('#selgridtab').jfGridSet('refreshdata', tempdatra); - - }); - $div.append($hbtn); - return $div; - } - }, - ], - mainId: 'AAIId', - }); - - }, - // 初始化列表 - initGird: function () { - $('#gridtable').lrAuthorizeJfGridLei({ - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', - headData: [ - //{ - // label: "审核状态", name: "CheckMark", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "已审核" : "未审核"; - // } - //}, - { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, }, - { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, }, - { label: "学号", name: "ProvinceCode", width: 100, align: "left" }, - { label: "姓名", name: "StuName", width: 100, align: "left" }, - { - label: "性别", name: "GenderNo", width: 80, align: "left", - formatter: function (cellvalue) { - return cellvalue == true ? "男" : "女"; - } - }, - { - label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, - formatter: function (value) { - return learun.formatDate(value, 'yyyy-MM-dd'); - } - }, - { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, - { - label: "民族", name: "NationalityNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'National', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - //{ - // label: "政治面貌", name: "PartyFaceNo", width: 100, align: "left", - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'PolityStatus', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - { label: "年级", name: "Grade", width: 100, align: "left" }, - { - label: "系所", name: "DeptNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - callback(_data['deptname']); - } - }); - } - }, - { - label: "专业", name: "MajorNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', - key: value, - keyId: 'majorno', - callback: function (_data) { - callback(_data['majorname']); - } - }); - } - }, - { - label: "班级", name: "ClassNo", width: 100, align: "left", - formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('custmerData', { - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', - key: value, - keyId: 'classno', - callback: function (_data) { - callback(_data['classname']); - } - }); - } - }, - { - label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'EduSystem', - callback: function (_data) { - callback(_data.text); - } - }); + var entity = $('body').lrGetFormData(); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveFormOfIn', { keyValue: '', strEntity: JSON.stringify(entity) }, + function (res) { + if (res.code == 200) { + setTimeout(function () { + location.reload(); + }, 100) } - }, - //{ - // label: "身体状态", name: "HealthStatus", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'QRCodeHealthStatus', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "学习形式", name: "StudyModality", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StudyModality', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, - //{ label: "入学方式", name: "EntranceWay", width: 100, align: "left" }, - //{ label: "入学年月", name: "EntranceDate", width: 100, align: "left" }, - //{ label: "余额", name: "Balance", width: 100, align: "left" }, - { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, - { label: "联系电话", name: "mobile", width: 100, align: "left" }, - { label: "户口所在地", name: "FatherUnit", width: 100, align: "left" }, - { label: "档案所在地", name: "MatherUnit", width: 100, align: "left" }, - //{ - // label: "五年一贯制", name: "FiveYear", width: 100, align: "left" - // , formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'PieceCultivateWay', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "异动状态", name: "AbmormityMoveMark", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "" : ""; - // } - //}, - //{ - // label: "是否上传头像", name: "Photo", width: 80, align: "center", - // formatter: function (cellvalue) { - // if (cellvalue != null && cellvalue != "" && cellvalue != undefined) { - // return cellvalue = "是"; - // } else { - // return cellvalue = "否"; - // } - // } - //}, - //{ label: "拼音", name: "SpellFull", width: 100, align: "left", ishide: true }, - //{ label: "就读方式", name: "StudyingWay", width: 100, align: "left", ishide: true }, - //{ - // label: "国籍", name: "CountryNo", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'BCdCountry', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "港澳台侨外", name: "OverseasChineseNo", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'BCdOverseasChinese', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "婚姻状况", name: "MarriageStatus", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'BCdOverseasChinese', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "乘火车区间", name: "TrainInterval", width: 100, align: "left", ishide: true, }, - //{ label: "是否随迁子女", name: "IsTrailChildren", width: 100, align: "left", ishide: true, }, - //{ label: "生源地行政区划码", name: "StuPlaceCode", width: 100, align: "left", ishide: true, }, - //{ label: "出生地行政区划码", name: "BirthPlaceCode", width: 100, align: "left", ishide: true, }, - //{ label: "籍贯地行政区划码", name: "NativePlaceCode", width: 100, align: "left", ishide: true, }, - //{ label: "所属派出所", name: "BelongPolice", width: 100, align: "left", ishide: true, }, - //{ label: "户口所在地行政区划码", name: "ResidencePlaceCode", width: 100, align: "left", ishide: true, }, - //{ label: "是否农户", name: "ResidenceNo", width: 100, align: "left", ishide: true, }, - //{ - // label: "学生居住地类型", name: "StuLivePlaceType", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StuLivePlaceType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "健康状况", name: "HealthStatusNo", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'StuHealthType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "学生来源", name: "StuOrigin", width: 100, align: "left", ishide: true, }, - //{ label: "招生对象", name: "RecruitObject", width: 100, align: "left", ishide: true, }, - //{ label: "贫困户否建档立卡贫困户", name: "PoorIsRecord", width: 100, align: "left", ishide: true, }, - //{ - // label: "招生方式", name: "RecruitWay", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'RecruitWay', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "联招合作类型", name: "RecruitCooperateType", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'RecruitCooperateType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "准考证号", name: "AdmissionNo", width: 100, align: "left", ishide: true, }, - //{ label: "考生号", name: "ksh", width: 100, align: "left", ishide: true, }, - //{ label: "考试总分", name: "ExamScore", width: 100, align: "left", ishide: true, }, - //{ label: "联招合作办学形式", name: "RecruitCooperateForm", width: 100, align: "left", ishide: true, }, - //{ label: "联招合作学校代码", name: "RecruitCooperateSchoolNo", width: 100, align: "left", ishide: true, }, - //{ label: "校外教学点", name: "SchoolOutsidePlace", width: 100, align: "left", ishide: true, }, - //{ label: "英文姓名", name: "EnglishName", width: 100, align: "left", ishide: true, }, - //{ label: "家庭邮政编码", name: "PostalCode", width: 100, align: "left", ishide: true, }, - //{ label: "其他联系方式", name: "OtherContact", width: 100, align: "left", ishide: true, }, - //{ label: "成员1姓名", name: "OneName", width: 100, align: "left", ishide: true, }, - //{ label: "成员1联系电话", name: "OneMobile", width: 100, align: "left", ishide: true }, - //{ - // label: "成员1关系", name: "OneMembership", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'GuardianType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员1是否监护人", name: "OneIsGuardian", width: 100, align: "left", ishide: true, }, - //{ - // label: "成员1出生年月", name: "OneBirthday", width: 100, align: "left", ishide: true, - // formatter: function (value) { - // return learun.formatDate(value, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: "成员1身份证件类型", name: "OneIdCardType", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'IdCardType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员1身份证件号", name: "OneIdCardNo", width: 100, align: "left", ishide: true, }, - //{ - // label: "成员1民族", name: "OneNationalityNo", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'National', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "成员1健康状况", name: "OneHealthStatus", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'EpiHealth', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员1工作或学习单位", name: "OneJob", width: 100, align: "left", ishide: true, }, - //{ label: "成员2姓名", name: "TwoName", width: 100, align: "left", ishide: true, }, - //{ label: "成员2联系电话", name: "TwoMobile", width: 100, align: "left", ishide: true }, - //{ - // label: "成员2关系", name: "TwoMembership", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'GuardianType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员2是否监护人", name: "TwoIsGuardian", width: 100, align: "left", ishide: true, }, - //{ - // label: "成员2出生年月", name: "TwoBirthday", width: 100, align: "left", ishide: true, - // formatter: function (value) { - // return learun.formatDate(value, 'yyyy-MM-dd'); - // } - //}, - //{ - // label: "成员2身份证件类型", name: "TwoIdCardType", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'IdCardType', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员2身份证件号", name: "TwoIdCardNo", width: 100, align: "left", ishide: true, }, - //{ - // label: "成员2民族", name: "TwoNationalityNo", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'National', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ - // label: "成员2健康状况", name: "TwoHealthStatus", width: 100, align: "left", ishide: true, - // formatterAsync: function (callback, value, row, op, $cell) { - // learun.clientdata.getAsync('dataItem', { - // key: value, - // code: 'EpiHealth', - // callback: function (_data) { - // callback(_data.text); - // } - // }); - // } - //}, - //{ label: "成员2工作或学习单位", name: "TwoJob", width: 100, align: "left", ishide: true, }, - //{ label: "成员2职务", name: "TwoPosition", width: 100, align: "left", ishide: true, }, - - ], - mainId: 'StuId', - isPage: true, - rows: 100, - isMultiselect: true, - onSelectRow: function (rowdata) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - // 合并两个数组 - list = list.concat(selectedRow) - // 去重 - let temp = {} - list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 - if (temp[curv.StuNo]) { } - else { - temp[curv.StuNo] = true - prev.push(curv) - } - return prev - }, []) - //console.log('resources', list) } - console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); - } - - }); - page.search(); + ); + }) }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); - } + }; refreshGirdData = function () { page.search(); }; page.init(); -} -function delbtn() { - console.log('111111') } \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml index f8127522a..2c92417f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.cshtml @@ -47,10 +47,10 @@
@*
-
- 点击 -
-
*@ +
+ 点击 +
+
*@
@@ -61,10 +61,10 @@
-
+
异动类型*
-
+
注销账号*
@@ -82,15 +82,9 @@
异动原因
-
-
休学年限*
- -
-
-
休学时段(文本框暂时)*
- - @**@ -
+
+
+ 提交
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js index 616770f4d..e625a6b60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js @@ -125,7 +125,8 @@ var bootstrap = function ($, learun) { }); //提交下拉框 - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#AnomalousType').lrselectSet("02"); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); // 刷新 @@ -302,7 +303,23 @@ var bootstrap = function ($, learun) { ], mainId: 'AAIId', }); - + //提交 + $('#subbtn').on('click', function () { + if (!$('body').lrValidform()) { + return false; + } + var entity = $('body').lrGetFormData(); + var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, + function (res) { + if (res.code == 200) { + setTimeout(function () { + location.reload(); + }, 100) + } + } + ); + }) }, // 初始化列表 initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs index fd1817ebf..34ab21632 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs @@ -249,7 +249,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.DeptNo = item.DeptNo; InsertEntity.Grade = item.Grade; InsertEntity.EduSystem = item.EduSystem; - InsertEntity.EnteDate = DateTime.Now.ToDate(); //前端还是后端处理 + InsertEntity.EnteDate = entity.EnteDate; //前端还是后端处理 //新数据 InsertEntity.AnomalousType = entity.AnomalousType; InsertEntity.ChangeReason = entity.ChangeReason;