diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
index 3ed8a1682..b3a955fa3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.cshtml
@@ -21,7 +21,7 @@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js
index 5c369d8e1..50ed616bc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateReturnBooks.js
@@ -50,10 +50,14 @@ var bootstrap = function ($, learun) {
//图书资料归还
$('#lr_returnbooks').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('StuId');
+ var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus');
if (learun.checkrow(keyValue)) {
+ if (ReturnBooksStatus == 1) {
+ return learun.alert.warning("选中项目已归还!");
+ }
learun.layerConfirm('是否确认归还图书资料!', function (res) {
if (res) {
- learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue,status:'1' }, function () {
+ learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '1' }, function () {
refreshGirdData();
});
}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js
index 5b6d436d5..eadcd071b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/ScoreQueryAllIndex.js
@@ -45,9 +45,13 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否准许 ' + stuName + ' 毕业?', function (res) {
if (res) {
- learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () {
- $('#btn_Search').trigger('click');
+ learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue +'&status=1', function () {
+ refreshGirdData();
+ //$('#btn_Search').trigger('click');
});
+ //learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '1' }, function () {
+ // $('#btn_Search').trigger('click');
+ //});
}
});
}
@@ -59,7 +63,7 @@ var bootstrap = function ($, learun) {
if (learun.checkrow(keyValue)) {
learun.layerConfirm('是否不准 ' + stuName + ' 毕业?', function (res) {
if (res) {
- learun.httpAsync('get', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate', { stuNo: keyValue, status: '0' }, function () {
+ learun.getForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/AllowGraduate?stuNo=' + keyValue + '&status=0', function () {
$('#btn_Search').trigger('click');
});
}