Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs

@@ -120,14 +120,14 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult Lock(string keyValue)
         {
             cdMajorIBLL.Lock(keyValue);
-            return Success("审核成功！");
+            return Success("操作成功！");
         }
         [HttpPost]
         [AjaxOnly]
         public ActionResult UnLock(string keyValue)
         {
             cdMajorIBLL.UnLock(keyValue);
-            return Success("去审成功！");
+            return Success("操作成功！");
         }
         /// <summary>
         /// 删除实体数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js

@@ -97,7 +97,7 @@ var bootstrap = function ($, learun) {
                     //    learun.alert.warning("当前项目已审核无需再审！");
                     //    return;
                     //}
-                    learun.layerConfirm('是否确认审核该项！', function (res) {
+                    learun.layerConfirm('是否确认启用该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/CdMajor/Lock', { keyValue: keyValue }, function () {
                                 refreshGirdData();
@@ -119,7 +119,7 @@ var bootstrap = function ($, learun) {
                     //    learun.alert.warning("当前项目还未审核不需要去审核！");
                     //    return;
                     //}
-                    learun.layerConfirm('是否确认去审核该项！', function (res) {
+                    learun.layerConfirm('是否确认停用该项！', function (res) {
                         if (res) {
                             learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/CdMajor/UnLock', { keyValue: keyValue }, function () {
                                 refreshGirdData();

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js

@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
             }
         },
         bind: function () {
-            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' }); 
+            $('#DepositBank').lrDataItemSelect({ code: 'DepositBank' });
             $('#F_ProvinceId').lrDataSourceSelect({
                 code: 'DIC_PROVINCE', value: 'pcode', text: 'pname',
                 select: function (item) {
@@ -169,7 +169,15 @@ var bootstrap = function ($, learun) {
                         learun.alert.error('请先选择系和专业');
                     }
                 });
-            $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); 
+            $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' });
+            //监听身份证号，绑定出生日期
+            $("#IdentityCardNo").blur(function () {
+                var cardNo = $(this).val().trim();
+                if (cardNo) {
+                    var date = cardNo.slice(6, 10) + "-" + cardNo.slice(10, 12) + "-" + cardNo.slice(12, 14);
+                    $("#Birthday").val(date);
+                }
+            });
         },
         initData: function () {
             if (!!keyValue) {