Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

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();
                             });
                         }

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();
                             });
                         }

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();
                             });
                         }

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();
                             });
                         }

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();
                             });
                         }

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();
                             });
                         }

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">

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.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();
                             });
                         }
@@ -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/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/IsReturnBooks', { keyValue: keyValue, status: '0' }, function () {
                                 refreshGirdData();
                             });
                         }

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) {

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');
                             });
                         }