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..87e7398a3 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,15 +97,6 @@ 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
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..4f91debc3 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,6 +48,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js
index e28704a60..296aa8a4c 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();
@@ -261,11 +252,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/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.js
index fd8662c94..d53320c49 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
@@ -268,7 +268,7 @@ var bootstrap = function ($, learun) {
{
label: '审核状态', name: 'F_EnabledMark', width: 80, align: "left",
formatter: function (cellvalue) {
- return cellvalue == "1" ? "已审核" : "未审核";
+ return cellvalue == "1" ? "已生效" : "未生效";
}
},
{
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..3c4423b90 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,6 @@
-
@@ -8050,7 +8049,6 @@
-
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..ae1bb693f 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)
{
//添加数据
@@ -365,7 +370,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);