diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs index 8ae2c9bca..02dc205d3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs @@ -1,5 +1,6 @@ using Learun.Application.TwoDevelopment.EducationalAdministration; using Learun.Util; +using System; using System.Collections.Generic; using System.Data; using System.Web.Mvc; @@ -33,6 +34,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] + public ActionResult FormView() + { + return View(); + } /// /// 表单页 /// @@ -97,15 +103,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 审核页 - /// - /// - [HttpGet] - public ActionResult CheckForm() - { - return View(); - } #endregion #region 获取数据 @@ -153,7 +150,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers public ActionResult GetFormData(string keyValue) { var data = stuTransferInfoIBLL.GetEntity(keyValue); - return Success(data); + var jsonData = new + { + StuTransferInfo = data + }; + return Success(jsonData); } #endregion @@ -185,6 +186,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers StuTransferInfoEntity entity = strEntity.ToObject(); entity.AnomalousType = "04"; entity.ChangeReason = "转入"; + entity.StuId= Guid.NewGuid().ToString(); stuTransferInfoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } @@ -213,7 +215,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpPost] [ValidateAntiForgeryToken] [AjaxOnly] - public ActionResult SaveAgainEntity(string keyValue, StuTransferInfoEntity entity, string strStuTranEntity) + public ActionResult SaveAgainEntity(StuTransferInfoEntity entity, string strStuTranEntity) { List strStuTranList = strStuTranEntity.ToObject>(); stuTransferInfoIBLL.SaveAgainEntity(entity, strStuTranList); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml deleted file mode 100644 index 8aa29a0e4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml +++ /dev/null @@ -1,15 +0,0 @@ -@{ - ViewBag.Title = "学籍异动列表审核"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
审核状态*
-
-
-
-
审核用户*
- -
-
-@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js deleted file mode 100644 index f7076219a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js +++ /dev/null @@ -1,43 +0,0 @@ -/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 - * 创建人：超级管理员 - * 日 期：2023-01-04 15:03 - * 描 述：学籍异动列表 - */ -var acceptClick; -var keyValue = request('keyValue'); -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initData(); - page.bind(); - }, - bind: function () { - $('#F_EnabledMark').lrselect({ - data: [{ text: "同意", value: "1" }, { text: "作废", value: "2" }], - text: "text", - value: "value" - }); - $('#CheckUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId; - $('#CheckUserId').val(learun.clientdata.get(['userinfo']).realName); - }, - initData: function () { - - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - }; - page.init(); -} 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 5f8894a42..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 @@ -48,7 +48,9 @@
 审核 +  删除  打印 +  查看
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 e28704a60..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 @@ -28,10 +28,8 @@ var bootstrap = function ($, learun) { }); $('#CheckUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); $('#CreateUserId').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_encode', text: 'f_realname' }); - $('#F_EnabledMark').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#F_EnabledMark').lrselect({ - data: [{ text: "作废", value: "0" }, { text: "未审核", value: "1" }, { text: "已审核", value: "2" }], + data: [{ text: "未生效", value: "0" }, { text: "已生效", value: "1" }], text: "text", value: "value" }) @@ -49,21 +47,14 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark'); if (CheckMark.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已审核项，已审核项不能二次审核！"); - return; - } - if (CheckMark.indexOf('2') != -1) { - learun.alert.warning("选中记录中包含已作废项，不可审核！"); + learun.alert.warning("选中记录中包含已审核项目，已审核项不能二次审核！"); return; } - learun.layerForm({ - id: 'form', - title: '审核页面', - url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue, - width: 400, - height: 300, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); + learun.layerConfirm('是否确认审核选中项进行学籍异动,该项不可逆转！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm', { keyValue: keyValue }, function () { + refreshGirdData(); + }); } }); } @@ -74,10 +65,10 @@ var bootstrap = function ($, learun) { var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark'); if (learun.checkrow(keyValue)) { if (CheckMark.indexOf('1') != -1) { - learun.alert.warning("选中记录中包含已审核项目,不可删除！"); + learun.alert.warning("选中记录中包含已生效项目,不可删除！"); return; } - learun.layerConfirm('是否确认删除该项！', function (res) { + learun.layerConfirm('是否确认删除该项,此项不可逆！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/DeleteForm', { keyValue: keyValue }, function () { refreshGirdData(); @@ -86,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({ @@ -261,11 +270,9 @@ var bootstrap = function ($, learun) { label: '审核状态', name: 'F_EnabledMark', width: 100, align: "left", formatter: function (cellvalue) { if (cellvalue == "0") { - return "未审核"; + return "未生效"; } else if (cellvalue == "1") { - return "已审核"; - } else if (cellvalue == "2") { - return "作废"; + return "已生效"; } } }, diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml index 78c20a240..32f26563d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml @@ -47,10 +47,10 @@ @*
-
- 点击 -
-
*@ +
+ 点击 +
+ *@
@@ -58,23 +58,23 @@
-
+
-
-
-
+
+
+
异动类型*
-
+
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
@@ -83,6 +83,9 @@
+
+ 提交 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js index 1beeab642..acbc18c60 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js @@ -124,7 +124,8 @@ var bootstrap = function ($, learun) { text: "classname" }); //提交下拉框 - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#AnomalousType').lrselectSet("05"); $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); // 刷新 @@ -149,6 +150,22 @@ var bootstrap = function ($, learun) { }); } }); + $('#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) + } + } + ); + }) $('#selgridtab').jfGrid({ headData: [ //{ @@ -695,17 +712,11 @@ var bootstrap = function ($, learun) { 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) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -713,11 +724,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); 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 new file mode 100644 index 000000000..4d83d3966 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.cshtml @@ -0,0 +1,105 @@ +@{ + ViewBag.Title = "学籍异动列表"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
姓名
+ +
+
+
学号
+ +
+
+
性别
+
+
+
+
证件号码
+ +
+
+
异动类型
+
+
+
+
是否保留学籍
+
+
+
+
申请人
+
+
+
+
申请时间
+ +
+
+
休学年限
+ +
+
+
生效状态
+
+
+
+
异动前班级
+
+
+
+
异动前年级
+
+
+
+
异动前专业
+
+
+
+
异动前系部
+
+
+
+
异动后班级
+
+
+
+
异动后年级
+
+
+
+
异动后专业
+
+
+
+
异动后系部
+
+
+
+
异动原因
+ +
+
+
离班日期
+ +
+
+
审核人
+
+
+
+
审核状态
+
+
+
+
审核时间
+ +
+
+
备注
+ +
+ + +
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.js new file mode 100644 index 000000000..ca5b47213 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/FormView.js @@ -0,0 +1,93 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2023-01-04 15:03 + * 描 述：学籍异动列表 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.bind(); + page.initData(); + }, + bind: function () { + $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#F_EnabledMark').lrselect({ data: [{ id: '0', text: '未生效' }, { id: '1', text: '已生效' }]}); + $('#F_EnabledMark2').lrselect({ data: [{ id: '0', text: '未审核' }, { id: '1', text: '已审核' }] }); + $('#CreateUserId').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + $('#CheckUserId').lrDataSourceSelect({ code: 'BaseUser', value: 'f_userid', text: 'f_realname' }); + $('#NewDeptNo').lrselect({ + allowSearch: true, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + }); + $('#NewMajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + }); + $('#NewGrade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + }); + $('#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" + }); + $('#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', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + }); + $('#ClassNo').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" + }); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + $('#F_EnabledMark2').lrselectSet(data[id].F_EnabledMark); + }); + } + } + }; + + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml index 71496b7ad..aff85bd22 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml @@ -93,6 +93,9 @@  编辑  删除
+
+  查看 +
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 fd8662c94..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 @@ -101,30 +101,40 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + // 查看 + $('#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').lrAuthorizeJfGrid({ 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', @@ -137,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', @@ -149,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, @@ -175,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", + label: '审核状态', name: 'F_EnabledMark', width: 200, align: "left", formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + return cellvalue == "1" ? "已生效" : "未生效"; } }, { - 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", - 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, 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..1c9727663 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 c9194f72f..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,621 +124,38 @@ var bootstrap = function ($, learun) { } }); - $('#ClassNo').lrselect({ + $('#NewClassNo').lrselect({ allowSearch: true, url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, value: "classno", text: "classname" }); - //提交下拉框 - - $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'}); - $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); - $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - //查看 - $('#lr_view').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('StuId'); - if (learun.checkrow(keyValue)) { - if (keyValue.indexOf(',') != -1) { - learun.alert.warning("只能选择一条记录进行查看！"); - return; - } - learun.layerForm({ - id: 'form', - title: '查看', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, - width: 1162, - height: 600, - btn: null - }); + $('#IdCardType').lrDataItemSelect({ code: 'IdCardType' }); + $('#Gender').lrDataItemSelect({ code: 'usersexbit' }); + $('#NationalityNo').lrDataItemSelect({ code: 'National' }); + $('#IsInAccommodation').lrDataItemSelect({ code: 'YesOrNoInt' }); + // 提交 + $('#subbtn').on('click', function () { + if (!$('body').lrValidform()) { + return false; } - }); - $('#selgridtab').jfGrid({ - headData: [ - //{ - // label: "审核状态", name: "CheckMark", width: 80, align: "center", - // formatter: function (cellvalue) { - // return cellvalue == "1" ? "已审核" : "未审核"; - // } - //}, - { 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(); -} +} \ No newline at end of file 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 9d43d124e..43eff40b3 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 @@ -827,25 +827,18 @@ var bootstrap = function ($, learun) { rows: 100, isMultiselect: true, onSelectRow: function (rowdata, type) { - //console.log(rowdata) - //console.log(type) - if (type) { - var selectedRow = $('#gridtable').jfGridGet('rowdata'); - if (list.length < 1) { - list = selectedRow - } else { - list = list.concat(selectedRow) - let temp = {} - list = list.reduce((prev, curv) => { - if (temp[curv.StuNo]) { } - else { - temp[curv.StuNo] = true - prev.push(curv) - } - return prev - }, []) - } + list.push(rowdata) + let temp = {} + list = list.reduce((prev, curv) => { + if (temp[curv.StuNo]) { } + else { + temp[curv.StuNo] = true + prev.push(curv) + } + return prev + }, []) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); tempdatra = list $('#selgridtab').jfGridSet('refreshdata', tempdatra); } 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 36c878bf7..7db8c18e7 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 @@ -112,35 +112,36 @@
-
+
异动类型*
-
+
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
-
-
异动原因
- -
-
+
休学年限*
-
-
休学时段(文本框暂时)*
+
+
休学时段*
+
+
异动原因
+ +
+
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 0cbb30522..7b09fbff7 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 @@ -728,17 +728,11 @@ var bootstrap = function ($, learun) { 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) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -746,11 +740,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml index 7ff56be80..87caeb4c8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml @@ -54,35 +54,35 @@
-
+
异动类型*
-
+
恢复学籍*
-
+
恢复账号*
-
+
入班日期*
-
+
系部*
-
+
专业*
-
+
年级*
-
+
班级*
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js index 04248d0aa..e2bd42592 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js @@ -20,7 +20,7 @@ var bootstrap = function ($, learun) { var entity = $('body').lrGetFormData(); entity.AnomalousType = entity.NewAnomalousType; var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); - $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) }, + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveAgainEntity', { entity: entity, strStuTranEntity: JSON.stringify(selgridtab) }, function (res) { //console.log(res) if (res.code == 200) { @@ -830,17 +830,11 @@ var bootstrap = function ($, learun) { 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) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -848,11 +842,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); 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..68c75ba61 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 @@
@*
-
- 点击 -
-
*@ +
+ 点击 +
+
*@
@@ -58,23 +58,23 @@
-
+
-
-
-
+
+
+
异动类型*
-
+
-
+
注销账号*
-
+
保留学籍*
-
+
离班日期*
@@ -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 b06dea42e..cac7fdde1 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 () { @@ -696,17 +713,11 @@ var bootstrap = function ($, learun) { 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) - // 去重 + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) let temp = {} list = list.reduce((prev, curv) => { - // 若临时对象中有一模一样的item，则什么都不做 if (temp[curv.StuNo]) { } else { temp[curv.StuNo] = true @@ -714,11 +725,10 @@ var bootstrap = function ($, learun) { } return prev }, []) - //console.log('resources', list) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); } - //console.log(list) - tempdatra = list - $('#selgridtab').jfGridSet('refreshdata', tempdatra); } }); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 77b6188db..8c015eb02 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1362,7 +1362,7 @@ - + @@ -8050,7 +8050,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoBLL.cs index ac78438bd..48c8cbd54 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoBLL.cs @@ -165,9 +165,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } /// - /// 休学 + /// 复学 /// - /// /// /// public void SaveAgainEntity(StuTransferInfoEntity entity, List strStuList) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs index bcd646fff..86d114c44 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs @@ -159,7 +159,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CHECKUSERID")] public string CheckUserId { get; set; } /// - /// 审核状态//0未审核,1已审核 2 作废 + /// 审核状态//0未生效1已生效 /// /// [Column("F_ENABLEDMARK")] 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..e8e5d00e5 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 @@ -103,6 +103,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("StuStatus", queryParam["StuStatus"].ToString(), DbType.String); strSql.Append(" AND t.StuStatus = @StuStatus "); } + if (!queryParam["F_EnabledMark"].IsEmpty()) + { + dp.Add("F_EnabledMark", queryParam["F_EnabledMark"].ToString(), DbType.String); + strSql.Append(" AND t.F_EnabledMark = @F_EnabledMark "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) @@ -197,7 +202,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (entity.AnomalousType == "04")//转入 { if (this.BaseRepository("CollegeMIS").FindEntity(x => - x.AnomalousType == entity.AnomalousType && x.StuName == entity.StuName && + x.AnomalousType == entity.AnomalousType && x.StuName == entity.StuName && x.StuNo == entity.StuNo && x.IdentityCardNo == entity.IdentityCardNo) == null) { //添加数据 @@ -249,7 +254,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.DeptNo = item.DeptNo; InsertEntity.Grade = item.Grade; InsertEntity.EduSystem = item.EduSystem; - InsertEntity.EnteDate = DateTime.Now.ToDate(); //前端还是后端处理 + InsertEntity.IdentityCardNo = item.IdentityCardNo; + InsertEntity.EnteDate = entity.EnteDate; //前端还是后端处理 //新数据 InsertEntity.AnomalousType = entity.AnomalousType; InsertEntity.ChangeReason = entity.ChangeReason; @@ -355,6 +361,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.NewGrade = entity.NewGrade; InsertEntity.LeaveDate = entity.LeaveDate; InsertEntity.StuStatus = entity.StuStatus; + InsertEntity.IdentityCardNo = item.IdentityCardNo; //恢复学籍,恢复账号 InsertEntity.RecoverStuStatus = entity.RecoverStuStatus; InsertEntity.RecoverWriteMark = entity.RecoverWriteMark; @@ -365,7 +372,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { if (this.BaseRepository("CollegeMIS").FindEntity(x => x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate && - x.NewDeptNo==InsertEntity.NewDeptNo && x.NewMajorNo == InsertEntity.NewMajorNo && x.NewClassNo==InsertEntity.NewClassNo && x.NewGrade==InsertEntity.NewGrade) == null) + x.NewDeptNo == InsertEntity.NewDeptNo && x.NewMajorNo == InsertEntity.NewMajorNo && x.NewClassNo == InsertEntity.NewClassNo && x.NewGrade == InsertEntity.NewGrade) == null) { //添加数据 entitylist.Add(InsertEntity); @@ -427,7 +434,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration case "06": //休学 case "08": //转专业 #region 复制一份学生学籍表 - + InsertStuTran.StuId = stulist.StuId; InsertStuTran.StuNo = stulist.StuNo; InsertStuTran.StuCode = stulist.StuCode; InsertStuTran.NoticeNo = stulist.NoticeNo; @@ -604,6 +611,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertStuTran.AnomalousType = upTrua.AnomalousType; InsertStuTran.ChangeReason = upTrua.ChangeReason; InsertStuTran.TranDateTime = DateTime.Now; + InsertStuTran.Create(); InStuinTran.Add(InsertStuTran); #endregion @@ -617,9 +625,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration StuEntity.StuNo = upTrua.StuNo; StuEntity.StuName = upTrua.StuName; StuEntity.ClassNo = upTrua.ClassNo; - StuEntity.MajorNo = upTrua.MajorNo; - StuEntity.DeptNo = upTrua.DeptNo; - StuEntity.Grade = upTrua.Grade; + StuEntity.MajorNo = upTrua.NewMajorNo; + StuEntity.DeptNo = upTrua.NewDeptNo; + StuEntity.Grade = upTrua.NewGrade; StuEntity.EduSystem = upTrua.EduSystem; upStulist.Add(StuEntity); } @@ -632,10 +640,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 删除用户表 - //是注销学籍,删除学籍 - if (upTrua.F_WriteMark == 0) + //是注销账号,账号禁用 + if (upTrua.F_WriteMark == 1) { - db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark=1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); + db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); } #endregion @@ -651,7 +659,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var ReturnStu = this.BaseRepository("CollegeMIS").FindEntity(x => x.StuId == upTrua.StuId); #region 重新生成学籍 - + addTruan.StuId = ReturnStu.StuId; addTruan.StuNo = ReturnStu.StuNo; addTruan.StuCode = ReturnStu.StuCode; addTruan.NoticeNo = ReturnStu.NoticeNo; @@ -829,7 +837,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (upTrua.RecoverWriteMark == "0") //恢复账号 { - db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); + db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark= 1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); UpStuTran.Add(upTrua); //修改学籍异动表 为复学 } } @@ -837,7 +845,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration case "04": //转入 #region 学籍表加数据 var stuInfoBasicEntity = new StuInfoBasicEntity(); - stuInfoBasicEntity.Create(); + stuInfoBasicEntity.StuId = upTrua.StuId; stuInfoBasicEntity.StuNo = upTrua.StuNo; stuInfoBasicEntity.StuName = upTrua.StuName; stuInfoBasicEntity.DeptNo = upTrua.DeptNo; @@ -861,7 +869,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration default: #region 复制一份学生学籍表 - InsertStuTran.StuNo = stulist.StuNo; + InsertStuTran.StuId = stulist.StuId; InsertStuTran.StuNo = stulist.StuNo; InsertStuTran.StuCode = stulist.StuCode; InsertStuTran.NoticeNo = stulist.NoticeNo; InsertStuTran.GraduateYear = stulist.GraduateYear; @@ -1037,7 +1045,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertStuTran.AnomalousType = upTrua.AnomalousType; InsertStuTran.ChangeReason = upTrua.ChangeReason; InsertStuTran.TranDateTime = DateTime.Now; - + InsertStuTran.Create(); InStuinTran.Add(InsertStuTran); #endregion @@ -1067,10 +1075,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration #region 删除用户表 - //是注销学籍,删除学籍 - if (upTrua.F_WriteMark == 0) + //是注销账号,账号禁用 + if (upTrua.F_WriteMark == 1) { - db1.ExecuteBySql(" update LR_Base_User set F_DeleteMark=1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); + db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark=0 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); } #endregion