From 631ec82769c471ecdff32716f6e3b55b0973f419 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Fri, 19 Aug 2022 14:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E4=B9=A6=E8=B5=84=E6=96=99=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/GraduateReturnBooks.cshtml      |  2 +-
 .../Views/StuInfoBasic/GraduateReturnBooks.js          |  6 +++++-
 .../Views/StuScore/ScoreQueryAllIndex.js               | 10 +++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

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 @@
                                     <input id="StuName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">第几级</div>
+                                    <div class="lr-form-item-title">年级</div>
                                     <input id="Grade" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
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');
                             });
                         }