From 34fbc950167469cab25f54b2298e2c7b11b21282 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 4 Aug 2022 11:03:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AD=A6=E7=B1=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=9B=91=E5=90=AC=E8=BA=AB=E4=BB=BD?=
 =?UTF-8?q?=E8=AF=81=E5=8F=B7=EF=BC=8C=E7=BB=91=E5=AE=9A=E5=87=BA=E7=94=9F?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/StuInfoBasic/Form.js                       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js
index d763b8f2c..adfeb5b0c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js	
+++ b/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) {

From 09939d390b6ec978c7a5d5f87b0f7e51a478e342 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 4 Aug 2022 11:24:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=89=E8=AF=AFand=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/CdMajorController.cs                          | 4 ++--
 .../Areas/EducationalAdministration/Views/CdMajor/Index.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs
index a02d01306..550e32d4d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/CdMajorController.cs	
+++ b/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>
         /// 删除实体数据
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js
index 7ba79830e..0f1128d7d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CdMajor/Index.js	
+++ b/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();