diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs index ae881ba38..c78c8c1f6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoFreshController.cs @@ -33,7 +33,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL(); private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); - private CdDeptIBLL cdDeptIBLL = new CdDeptBLL(); #region 视图功能 @@ -649,7 +648,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { tempLength++; item.ClassNo = classNo; - item.DeptNo = ClassInfoEntity.DeptNo; item.MajorNo = ClassInfoEntity.MajorNo; item.Grade = ClassInfoEntity.Grade; item.StuNo = string.Format("{0}{1}", classNo, tempLength < 10 ? "0" + tempLength : tempLength.ToString()); @@ -946,11 +944,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var majorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(postData.MajorNo); fileHead = majorEntity?.MajorName + fileHead; } - else if (!string.IsNullOrEmpty(postData.DeptNo)) - { - var deptEntity = cdDeptIBLL.GetCdDeptEntityByNo(postData.DeptNo); - fileHead = deptEntity?.DeptName + fileHead; - } FileStreamResult result = null; @@ -966,14 +959,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers IRow cellrow = sheet.CreateRow(1); cellrow.CreateCell(0).SetCellValue("姓名"); cellrow.CreateCell(1).SetCellValue("学号"); - cellrow.CreateCell(2).SetCellValue("系"); - cellrow.CreateCell(3).SetCellValue("专业"); - cellrow.CreateCell(4).SetCellValue("班级"); - cellrow.CreateCell(5).SetCellValue("宿舍楼"); - cellrow.CreateCell(6).SetCellValue("单元"); - cellrow.CreateCell(7).SetCellValue("楼层"); - cellrow.CreateCell(8).SetCellValue("房间"); - cellrow.CreateCell(9).SetCellValue("床位"); + cellrow.CreateCell(2).SetCellValue("专业"); + cellrow.CreateCell(3).SetCellValue("班级"); + cellrow.CreateCell(4).SetCellValue("宿舍楼"); + cellrow.CreateCell(5).SetCellValue("单元"); + cellrow.CreateCell(6).SetCellValue("楼层"); + cellrow.CreateCell(7).SetCellValue("房间"); + cellrow.CreateCell(8).SetCellValue("床位"); //获取数据源 var data = stuInfoFreshIBLL.GetList(queryJson).ToList(); @@ -983,14 +975,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers IRow row = sheet.CreateRow(2 + i); row.CreateCell(0).SetCellValue(item.StuName); row.CreateCell(1).SetCellValue(item.StuNo); - row.CreateCell(2).SetCellValue(item.DeptName); - row.CreateCell(3).SetCellValue(item.MajorName); - row.CreateCell(4).SetCellValue(item.ClassName); - row.CreateCell(5).SetCellValue(item.Build); - row.CreateCell(6).SetCellValue(item.Unit); - row.CreateCell(7).SetCellValue(item.floor); - row.CreateCell(8).SetCellValue(item.Room); - row.CreateCell(9).SetCellValue(item.Bed); + row.CreateCell(2).SetCellValue(item.MajorName); + row.CreateCell(3).SetCellValue(item.ClassName); + row.CreateCell(4).SetCellValue(item.Build); + row.CreateCell(5).SetCellValue(item.Unit); + row.CreateCell(6).SetCellValue(item.floor); + row.CreateCell(7).SetCellValue(item.Room); + row.CreateCell(8).SetCellValue(item.Bed); } var fileguid = Guid.NewGuid().ToString(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js index 972194138..f45bc9aec 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SignUpAboutOnline/Index.js @@ -122,7 +122,7 @@ var bootstrap = function ($, learun) { }, { label: "报名日期", name: "SignUpTime", width: 130, align: "left", formatter: function (cellvalue) { - return cellvalue == "0001-01-01 00:00:00" ? "" : cellvalue.slice(0,10); + return cellvalue == "0001-01-01 00:00:00" || cellvalue == null || cellvalue == "" || cellvalue == undefined ? "" : cellvalue.slice(0, 10); } }, { label: "姓名", name: "RealName", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.cshtml index e29933170..d71045b20 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.cshtml @@ -39,10 +39,6 @@
学校*
-
-
系所*
-
-
专业*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js index 9efee1a5e..b33636d75 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/FormOfDC.js @@ -32,7 +32,6 @@ var bootstrap = function ($, learun) { $("#ResidenceNo").parent().hide(); $("#F_ProvinceId").parent().parent().hide(); $("#Photo").parent().hide(); - $("#DeptNo").parent().hide(); $("#FamilyOriginNo").parent().hide(); $("#OverseasChineseNo").parent().hide(); $("#Grade").parent().hide(); @@ -115,57 +114,26 @@ var bootstrap = function ($, learun) { $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' }); $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); - $('#DeptNo').lrselect({ - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - select: function (item) { - if (item) { - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" } - }); - } - else { - $('#MajorNo').lrselectRefresh({ - url: "", - data: [] - }); - } - $('#ClassNo').lrselectRefresh({ - url: "", - data: [] - }); - } - }); $('#MajorNo').lrselect({ value: "majorno", text: "majorname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', select: function (item) { if (item) { $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" } }); } } }); - - $('#MajorNo').on("click", - function () { - var data = $('#DeptNo').lrselectGet(); - if (!data) { - learun.alert.error('请先选择系'); - } - }); $('#ClassNo').on("click", function () { - var data1 = $('#DeptNo').lrselectGet(); var data2 = $('#MajorNo').lrselectGet(); - if (!data1 || !data2) { - learun.alert.error('请先选择系和专业'); + if (!data2) { + learun.alert.error('请先选择专业'); } }); $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.cshtml index faf8c2e9a..222427546 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.cshtml @@ -18,10 +18,6 @@
姓名
-
-
系部
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js index 70704caf7..417283df5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/IndexOfDC.js @@ -11,7 +11,6 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 300, 400); - $('#DeptNo').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); // 刷新 @@ -662,19 +661,6 @@ var bootstrap = function ($, learun) { //{ label: "学籍号", name: "StuCode", 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: 100, align: "left" }, //{ label: "报到日期", name: "RegisterDate", width: 100, align: "left" }, //{ label: "余额", name: "Balance", width: 100, align: "left" }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.cshtml index 43d29779d..b3001c49b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.cshtml @@ -2,17 +2,18 @@ ViewBag.Title = "新生信息管理"; Layout = "~/Views/Shared/_Index.cshtml"; } +
-
-
-
系部
-
-
-
专业
@@ -34,18 +35,19 @@
 查询
-
-
-
班级
-
-
-
+
 确认分配
+
+
+
班级
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js index 9a7a69de9..8b381c964 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClass.js @@ -22,13 +22,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - - $('#DeptNo').lrselect({ - allowSearch: true, - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - }); + $('#MajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', @@ -42,22 +36,6 @@ var bootstrap = function ($, learun) { text: "classname" }); - - //$('#MajorNo').on("click", - // function () { - // var data = $('#DeptNo').lrselectGet(); - // if (!data) { - // learun.alert.error('请先选择系'); - // } - // }); - //$('#ClassNo').on("click", - // function () { - // var data1 = $('#DeptNo').lrselectGet(); - // var data2 = $('#MajorNo').lrselectGet(); - // if (!data1 || !data2) { - // learun.alert.error('请先选择系和专业'); - // } - // }); $("#btn_search").on("click", function () { page.search(getParam()); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.cshtml index 87802d4cc..a82cec6fb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.cshtml @@ -2,17 +2,19 @@ ViewBag.Title = "新生信息管理"; Layout = "~/Views/Shared/_Index.cshtml"; } + +
-
-
-
系部
-
-
-
专业
@@ -40,6 +42,13 @@
 查询
+ +
+ +
+
+  确认分配 +
班级
@@ -47,12 +56,6 @@
- -
-
-  确认分配 -
-
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js index cdc17de11..cba225771 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/AllocationClassDC.js @@ -22,13 +22,7 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); - - $('#DeptNo').lrselect({ - allowSearch: true, - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - }); + $('#MajorNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', @@ -42,22 +36,6 @@ var bootstrap = function ($, learun) { text: "classname" }); - - //$('#MajorNo').on("click", - // function () { - // var data = $('#DeptNo').lrselectGet(); - // if (!data) { - // learun.alert.error('请先选择系'); - // } - // }); - //$('#ClassNo').on("click", - // function () { - // var data1 = $('#DeptNo').lrselectGet(); - // var data2 = $('#MajorNo').lrselectGet(); - // if (!data1 || !data2) { - // learun.alert.error('请先选择系和专业'); - // } - // }); $("#btn_search").on("click", function () { page.search(getParam()); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js index 5997a5755..68f703915 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/CollectFileIndex.js @@ -89,18 +89,6 @@ var bootstrap = function ($, learun) { } }, { label: '收取档案时间', name: 'CollectFileDate', width: 130, 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.cshtml index 2728ea82d..3df878243 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.cshtml @@ -8,10 +8,6 @@ }
-
-
系
-
-
专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.js index 8083922e6..6004f266e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/ExportBedForm.js @@ -15,41 +15,17 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - //系 - $('#DeptNo').lrselect({ - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - allowSearch: true, - select: function (item) { - if (item) { - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }, - }); - } - else { - $('#MajorNo').lrselectRefresh({ - url: "", - data: [] - }); - } - $('#ClassNo').lrselectRefresh({ - url: "", - data: [] - }); - } - }); //专业 $('#MajorNo').lrselect({ value: "majorno", text: "majorname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', allowSearch: true, select: function (item) { if (item) { $('#ClassNo').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" } }); } @@ -62,30 +38,19 @@ var bootstrap = function ($, learun) { allowSearch: true, }); - - $('#MajorNo').on("click", function () { - var data = $('#DeptNo').lrselectGet(); - if (!data) { - learun.alert.error('请先选择系'); - return false; - } - }); - $('#ClassNo').on("click", function () { - var data1 = $('#DeptNo').lrselectGet(); var data2 = $('#MajorNo').lrselectGet(); - if (!data1 || !data2) { - learun.alert.error('请先选择系和专业'); + if (!data2) { + learun.alert.error('请先选择专业'); return false; } }); //点击导出按钮 $('#exportBtn').click(function () { - var DeptNo = $('#DeptNo').lrselectGet(); var MajorNo = $('#MajorNo').lrselectGet(); var ClassNo = $('#ClassNo').lrselectGet(); - var postData = { DeptNo: DeptNo, MajorNo: MajorNo, ClassNo: ClassNo }; + var postData = { MajorNo: MajorNo, ClassNo: ClassNo }; location.href = '/StuInfoFresh/ExportBed?queryJson=' + JSON.stringify(postData); }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml index 9cfc81e3f..eea77d850 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Form.cshtml @@ -32,10 +32,6 @@
性别 *
-
-
系所号
- -
专业号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.cshtml index 85b14254b..364ac2f0d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.cshtml @@ -38,10 +38,6 @@
毕业学校 *
-
-
系所号
-
-
选报专业
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js index f0a92f494..4ba90f16f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormDC.js @@ -26,20 +26,6 @@ var bootstrap = function ($, learun) { $("#MatriculateSort").lrDataItemSelect({ code: 'EnrollStyle' }); $('#ResidenceNo').lrDataItemSelect({ code: 'ResidenceNo' }); $('#EducationalSystem').lrDataItemSelect({ code: 'EduSystem' }); - - $('#DeptNo').lrDataSourceSelect({ - code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (val) { - var deptno = ""; - if (val) { - deptno = val.deptno; - } - $('#MajorNo').lrselectRefresh({ - url: top.$.rootUrl + '/EducationalAdministration/CdMajor/GetListByDeptNo?DeptNo=' + deptno, - text: "MajorName", - value: "MajorNo" - }) - } - }); $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml index a528eb6f4..a82cc0ed3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/FormView.cshtml @@ -38,10 +38,6 @@
性别 *
-
-
系所号
- -
专业号
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js index afcc0904e..d6dcfb98a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/GetKeyIndex.js @@ -209,18 +209,6 @@ var bootstrap = function ($, learun) { } }, { label: '领取校园卡时间', name: 'GetCardDate', width: 130, 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js index 296d47d15..d7f276efc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/Index.js @@ -198,18 +198,6 @@ var bootstrap = function ($, learun) { return cellvalue == true ? "是" : "否"; } }, - { - 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js index c77612a65..93268bb94 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/PayFeeIndex.js @@ -252,18 +252,6 @@ var bootstrap = function ($, learun) { } }, { label: '其他费用缴费时间', name: 'OtherPayFeeDate', width: 130, 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js index dfc099167..20bbf27af 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/RegisterIndex.js @@ -135,18 +135,6 @@ var bootstrap = function ($, learun) { } }, { label: '报到时间', name: 'ArriveDate', width: 130, 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js index 29aaae063..0c6a61362 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoFresh/StatusView.js @@ -135,18 +135,6 @@ var bootstrap = function ($, learun) { } }, { label: '领取校园卡时间', name: 'GetCardDate', width: 130, 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', { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml index 60987f4f5..86c81b45d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Floor.cshtml @@ -130,19 +130,6 @@ this.getData(); }.bind(this), 1000); }, - filter_Dept: function (value) { - var result; - top.learun.clientdata.getAsync('custmerData', { - sync: true, - url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', - key: value, - keyId: 'deptno', - callback: function (_data) { - result = _data.deptname; - } - }); - return result; - }, filter_Major: function (value) { var result; top.learun.clientdata.getAsync('custmerData', { @@ -260,7 +247,6 @@ '
  • 楼     层' + floor.floorNum + ' 层
    • ' + '
  • 空     床' + floor.NoStudentNum + ' 床
    • ' + '
  • 房     间' + floor.RoomNum + ' 间
    • ' + - '
  • 涉及院系' + this.filter_Dept(floor.dormitory.Dept) + '
    • ' + '
  • 床     位' + floor.UnitNum + ' 个
    • ' + '
  • 涉及专业' + this.filter_Major(floor.dormitory.Major) + '
    • ' + '' + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml index c96287895..498b7229c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.cshtml @@ -34,10 +34,6 @@
    校区
    -
    -
    系
    -
    -
    专业
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js index d6e1497cc..67bb4e35c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Accommodation/Form.js @@ -31,65 +31,34 @@ var bootstrap = function ($, learun) { value: "stuid", text: "stuname", url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic', - + }); - + $('#Class').lrselect({ value: "classno", text: "classname" }); - $('#Dept').lrselect({ - value: "deptno", - text: "deptname", - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', - select: function (item) { - if (item) { - $('#Major').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" } - }); - } - else { - $('#Major').lrselectRefresh({ - url: "", - data: [] - }); - } - $('#Class').lrselectRefresh({ - url: "", - data: [] - }); - } - }); $('#Major').lrselect({ value: "majorno", text: "majorname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', select: function (item) { if (item) { $('#Class').lrselectRefresh({ url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable', - param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" } + param: { code: "bjsj", strWhere: "majorno='" + item.majorno + "'" } }); } } }); - - $('#Major').on("click", - function () { - var data = $('#Dept').lrselectGet(); - if (!data) { - learun.alert.error('请先选择系'); - } - }); $('#Class').on("click", function () { - var data1 = $('#Dept').lrselectGet(); var data2 = $('#Major').lrselectGet(); - if (!data1 || !data2) { - learun.alert.error('请先选择系和专业'); + if (!data2) { + learun.alert.error('请先选择专业'); } }); }, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs index 20ec72cce..a6a95fa15 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoFresh/StuInfoFreshService.cs @@ -35,7 +35,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration t.zkzh, t.StuNo, t.StuName, - t.DeptNo, t.GenderNo, t.MajorNo, t.MajorDetailNok, @@ -126,9 +125,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build "); + strSql.Append("SELECT t.*,m.MajorName,c.ClassName,b.Name as Bed,r.Name as Room,f.Name as floor,u.Name as Unit,build.Name as Build "); strSql.Append(" FROM StuInfoFresh t "); - strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo "); strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo "); strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo "); strSql.Append(" left join Acc_DormitoryBuild b on t.DormitoryNo=b.ID "); @@ -137,12 +135,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(" left join Acc_DormitoryBuild u on f.ParentID=u.ID "); strSql.Append(" left join Acc_DormitoryBuild build on u.ParentID=build.ID "); strSql.Append(" where 1=1 "); - - if (!queryParam["DeptNo"].IsEmpty()) - { - strSql.Append(" and t.DeptNo = @DeptNo "); - dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); - } + if (!queryParam["MajorNo"].IsEmpty()) { strSql.Append(" and t.MajorNo = @MajorNo "); @@ -190,18 +183,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var dp = new DynamicParameters(new { }); var strSql = new StringBuilder(); - strSql.Append("SELECT t.*,d.DeptName,m.MajorName,c.ClassName "); + strSql.Append("SELECT t.*,m.MajorName,c.ClassName "); strSql.Append(" FROM StuInfoFresh t "); - strSql.Append(" left join CdDept d on t.DeptNo=d.DeptNo "); strSql.Append(" left join CdMajor m on t.MajorNo=m.MajorNo "); strSql.Append(" left join ClassInfo c on t.ClassNo=c.ClassNo "); strSql.Append(" where 1=1 "); - - if (!queryParam["DeptNo"].IsEmpty()) - { - strSql.Append(" and t.DeptNo = @DeptNo "); - dp.Add("DeptNo", queryParam["DeptNo"].ToString(), DbType.String); - } + if (!queryParam["MajorNo"].IsEmpty()) { strSql.Append(" and t.MajorNo = @MajorNo "); @@ -1214,8 +1201,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration F_EnabledMark = 1, F_Mobile = entity.telephone, F_Description = "学生", - F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity(x => x.MajorNo == entity.MajorNo)?.F_SchoolId, - F_DepartmentId = entity.DeptNo + F_CompanyId = this.BaseRepository("CollegeMIS").FindEntity(x => x.MajorNo == entity.MajorNo)?.F_SchoolId }; userIBLL.SaveEntity(null, userEntity); @@ -1589,7 +1575,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration .FindEntity(a => a.StuNo == stuFreshInfo.StuNo); if (stuInfo != null) { - bed.Dept = stuInfo.DeptNo; bed.Major = stuInfo.MajorNo; bed.Class = stuInfo.ClassNo; bed.StudentID = stuInfo.StuId; @@ -1627,7 +1612,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration .FindEntity(a => a.StuNo == stuFreshInfo.StuNo); if (stuInfo != null) { - bed.Dept = stuInfo.DeptNo; bed.Major = stuInfo.MajorNo; bed.Class = stuInfo.ClassNo; bed.StudentID = stuInfo.StuId; @@ -1718,7 +1702,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration //学籍表增加数据 var strSql = new StringBuilder(); strSql.Append(@"insert into StuInfoBasic -(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, DeptNo, MajorNo, MajorDetailNo, MajorDetailName, +(StuId, StuNo, StuCode, NoticeNo, GraduateYear, ksh, MajorNo, MajorDetailNo, MajorDetailName, Grade, ClassNo, StuName, SpellFull, SpellBrief, GenderNo, Birthday, PartyFaceNo, FamilyOriginNo, NationalityNo, ProvinceNo, RegionNo, ResidenceNo, TestStuSortNo, HealthStatusNo, WillNo, TestStuSubjectNo, GraduateNo, PlanFormNo, IsThreeGood, IsExcellent, IsNormalCadre, IsProvinceFirstThree, OverseasChineseNo, MatriculateSort, @@ -1729,7 +1713,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration MatherUnit, MatherPhone, username, password, MailAddress, PostalCode, InSchoolStatus, TransMark, ClassTutorNo, ResumeCheck, PracStatus, RegisterStatus, PunishmentDate, F_CityId, F_CountyId, F_ProvinceId, F_SchoolId, EduSystem, StudyModality, SyncFlag) -select NEWID(),StuNo,null,NoticeNo,null,ksh,DeptNo,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from +select NEWID(),StuNo,null,NoticeNo,null,ksh,MajorNo,MajorDetailNok as MajorDetailNo,MajorDetailName,Grade,ClassNo,StuName,null,null,case when GenderNo ='1' then 1 else 0 end,Birthday,PartyFaceNo,FamilyOriginNo,NationalityNo,ProvinceNo,RegionNo,ResidenceNo,TestStuSortNo,HealthStatusNo,WillNo,TestStuSubjectNo,GraduateNo,PlanFormNo,IsThreeGood,IsExcellent,IsNormalCadre,IsProvinceFirstThree,OverseasChineseNo,MatriculateSort,null,HighSchoolNo,HighSchoolName,null,null,GoodAt,IdentityCardNo,null,null,null,null,null,null,null,null,null,null,null,null,null,null,Remark,ArriveDate as RegisterDate,Photo,null,null,telephone as mobile,null,null,null,null,null,null,null,null,StuNo as username,null,MailAddress,PostalCode,null,TransMark,null,null,null,RegisterStatus,null,null,null,null,F_SchoolId,null,null,0 from (select f.*,m.F_SchoolId from StuInfoFresh f left join CdMajor m on f.MajorNo=m.MajorNo where f.StuNo is not null ) as bb where bb.StuNo not in (select b.StuNo from StuInfoBasic b where b.StuNo=bb.StuNo) ");