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 87e7398a3..8ae2c9bca 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
@@ -97,6 +97,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}
+ ///
+ /// 审核页
+ ///
+ ///
+ [HttpGet]
+ public ActionResult CheckForm()
+ {
+ return View();
+ }
#endregion
#region 获取数据
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
new file mode 100644
index 000000000..8aa29a0e4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml
@@ -0,0 +1,15 @@
+@{
+ 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
new file mode 100644
index 000000000..f7076219a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js
@@ -0,0 +1,43 @@
+/* * 版 本 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.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js
index 9da0b9451..fd6cfa4a2 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
@@ -46,17 +46,25 @@ var bootstrap = function ($, learun) {
// 审核
$('#lr_check').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('ID');
+ console.log(keyValue, "keyValue")
if (learun.checkrow(keyValue)) {
- var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+ var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
if (CheckMark.indexOf('1') != -1) {
- learun.alert.warning("选中记录中包含已审核项目，已审核项不能二次审核！");
+ learun.alert.warning("选中记录中包含已审核项，已审核项不能二次审核！");
return;
}
- learun.layerConfirm('是否确认审核选中项进行学籍异动,该项不可逆转！', function (res) {
- if (res) {
- learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm', { keyValue: keyValue }, function () {
- refreshGirdData();
- });
+ if (CheckMark.indexOf('2') != -1) {
+ 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);
}
});
}
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 3c4423b90..77b6188db 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,6 +1362,7 @@
+
@@ -8049,6 +8050,7 @@
+