From 97173eb2ec47da787e98ea4115ba971d808c19a6 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 19 Aug 2022 11:10:10 +0800 Subject: [PATCH 1/3] --- .../Views/StuInfoBasic/MyClass.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js index 22d037ba3..eca5946ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/MyClass.js @@ -44,8 +44,12 @@ var bootstrap = function ($, learun) { return cellvalue == true ? "男" : "女"; } }, - { label: "出生日期", name: "Birthday", width: 100, align: "left" }, - { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", + formatter: function (cellvalue) { + return learun.formatDate(cellvalue, 'yyyy-MM-dd'); + } }, + { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" }, { label: "民族", name: "NationalityNo", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { 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 2/3] =?UTF-8?q?=E5=9B=BE=E4=B9=A6=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=BD=92=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 @@
-
第几级
+
年级
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'); }); } From 31343b7d5d858750a59372976c2b4b752741ddbc Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 19 Aug 2022 15:59:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=9E=E7=90=86=E7=A6=BB=E6=A0=A1?= =?UTF-8?q?=E6=89=8B=E7=BB=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasic/GraduateCardDeregistrate.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateCheckOut.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateDiplomaReceive.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateEmployAgree.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateFeeSettle.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateFileTransfer.js | 8 ++++++-- .../Views/StuInfoBasic/GraduateReturnBooks.js | 8 ++++---- 7 files changed, 40 insertions(+), 16 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js index 079b81dbe..a398dc727 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCardDeregistrate.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //校园卡注销 $('#lr_cardderegistrate').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var CardDeregistrateStatus = $('#gridtable').jfGridValue('CardDeregistrateStatus'); if (learun.checkrow(keyValue)) { + if (CardDeregistrateStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已注销数据！"); + } learun.layerConfirm('是否确认注销校园卡！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消注销校园卡！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCardDeregistrate', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js index 746f451bb..76d50f9b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateCheckOut.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //办理退住手续 $('#lr_checkout').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var CheckOutStatus = $('#gridtable').jfGridValue('CheckOutStatus'); if (learun.checkrow(keyValue)) { + if (CheckOutStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已办理退住数据！"); + } learun.layerConfirm('是否确认办理退住手续！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消办理退住手续！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsCheckOut', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js index 7a34e3943..bb62c012f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateDiplomaReceive.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //毕业证领取 $('#lr_getcard').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus'); if (learun.checkrow(keyValue)) { + if (DiplomaReceiveStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已领取数据！"); + } learun.layerConfirm('是否确认领取毕业证！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消领取毕业证！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js index 9a8ca60f9..95917e329 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateEmployAgree.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //就业协议备案 $('#lr_employagree').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var EmployAgreeStatus = $('#gridtable').jfGridValue('EmployAgreeStatus'); if (learun.checkrow(keyValue)) { + if (EmployAgreeStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已备案数据！"); + } learun.layerConfirm('是否确认备案就业协议！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消备案就业协议！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsEmployAgree', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js index 9245bdf6e..e32d8896a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFeeSettle.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //学杂费结算 $('#lr_feesettle').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var FeeSettleStatus = $('#gridtable').jfGridValue('FeeSettleStatus'); if (learun.checkrow(keyValue)) { + if (FeeSettleStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已结算数据！"); + } learun.layerConfirm('是否确认结算学杂费！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消结算学杂费！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFeeSettle', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js index c4933c84c..67eaf8261 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/GraduateFileTransfer.js @@ -50,10 +50,14 @@ var bootstrap = function ($, learun) { //档案与组织关系转出 $('#lr_filetransfer').on('click', function () { var keyValue = $('#gridtable').jfGridValue('StuId'); + var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus'); if (learun.checkrow(keyValue)) { + if (FileTransferStatus.indexOf('1') != -1) { + return learun.alert.warning("选中项包括已转出数据！"); + } learun.layerConfirm('是否确认转出档案与组织关系！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue,status:'1' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -66,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消转出档案与组织关系！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsFileTransfer', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); } 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 50ed616bc..cc5d20685 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 @@ -52,12 +52,12 @@ var bootstrap = function ($, learun) { var keyValue = $('#gridtable').jfGridValue('StuId'); var ReturnBooksStatus = $('#gridtable').jfGridValue('ReturnBooksStatus'); if (learun.checkrow(keyValue)) { - if (ReturnBooksStatus == 1) { - return learun.alert.warning("选中项目已归还！"); + if (ReturnBooksStatus.indexOf('1') != -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.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '1' }, function () { refreshGirdData(); }); } @@ -70,7 +70,7 @@ var bootstrap = function ($, learun) { if (learun.checkrow(keyValue)) { learun.layerConfirm('是否确认取消归还图书资料！', function (res) { if (res) { - learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () { refreshGirdData(); }); }