From 1fe815833959938bca1d073282699be15024624a Mon Sep 17 00:00:00 2001
From: zhichao lei <442149704@qq.com>
Date: Thu, 15 Apr 2021 18:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/EmpInfo/Form.cshtml                 | 12 ++--
 .../Views/EmpInfo/Form.js                     | 71 ++++++++++++-------
 .../EmpInfo/EmpInfoEntity.cs                  |  8 ++-
 3 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml
index ef9d72447..66586b87e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.cshtml	
@@ -131,10 +131,14 @@
         <div class="col-xs-12 lr-form-item">
             <div class="lr-form-item-title lr-title">职业信息</div>
         </div>
-        <div class="col-xs-12 lr-form-item" data-table="EmpInfo">
-            <div class="lr-form-item-title">员工状态</div>
-            <div id="IsInActiveStatus"></div>
-        </div>
+    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="lr-form-item-title">员工状态</div>
+        <div id="IsInActiveStatus"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
+        <div class="lr-form-item-title">工资编号</div>
+        <input id="SalaryNumber" type="text" class="form-control" />
+    </div>
         <div class="col-xs-4 lr-form-item" data-table="EmpInfo">
             <div class="lr-form-item-title">职工编号<font face="宋体">*</font></div>
             <input id="EmpNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js
index 8b27a9bea..bc46bf4db 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EmpInfo/Form.js	
@@ -52,6 +52,7 @@ var bootstrap = function ($, learun) {
                 $("#TitleOfTechPostNo").parent().hide();
                 $("#InSchoolDate").parent().hide();
                 $("#resume").parent().hide();
+                $("#SalaryNumber").parent().hide();
                 //$("#Photo").parent().hide();
             }
         },
@@ -182,7 +183,7 @@ var bootstrap = function ($, learun) {
         }
     };
     // 保存数据
-    acceptClick = function (callBack) {
+    acceptClick = function(callBack) {
         if (!$('body').lrValidform()) {
             return false;
         }
@@ -194,38 +195,56 @@ var bootstrap = function ($, learun) {
         };
         //姓名重复提示
         var EmpName = $('#EmpName').val();
-        $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetEmpInfoEntitiesByEmpName?empName=' + EmpName, function (data) {
-            if (!!data.length && data.length > 0) {
-                var num = data.length;
-                if (!!keyValue) {
-                    for (var i = 0; i < data.length; i++) {
-                        if (data[i].EmpId == keyValue) {
-                            num = num - 1;
-                            break;
+        $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetEmpInfoEntitiesByEmpName?empName=' + EmpName,
+            function(data) {
+                if (!!data.length && data.length > 0) {
+                    var num = data.length;
+                    if (!!keyValue) {
+                        for (var i = 0; i < data.length; i++) {
+                            if (data[i].EmpId == keyValue) {
+                                num = num - 1;
+                                break;
+                            }
                         }
                     }
-                }
-                if (num > 0) {
-                    learun.layerConfirm('系统中姓名为' + EmpName + '的教师已经有' + num + '名，是否确认保存？', function (res) {
-                        if (res) {
-                            $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
-                                // 保存成功后才回调
-                                if (!!callBack) {
-                                    callBack();
+                    if (num > 0) {
+                        learun.layerConfirm('系统中姓名为' + EmpName + '的教师已经有' + num + '名，是否确认保存？',
+                            function(res) {
+                                if (res) {
+                                    $.lrSaveForm(
+                                        top.$.rootUrl +
+                                        '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' +
+                                        keyValue,
+                                        postDatas,
+                                        function(res) {
+                                            // 保存成功后才回调
+                                            if (!!callBack) {
+                                                callBack();
+                                            }
+                                        });
                                 }
                             });
+                        return;
+                    }
+                }
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' + keyValue,
+                    postDatas,
+                    function(res) {
+                        // 保存成功后才回调
+                        if (!!callBack) {
+                            callBack();
                         }
                     });
-                    return;
-                }
-            }
-            $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/EmpInfo/SaveForm?keyValue=' + keyValue, postDatas, function (res) {
-                // 保存成功后才回调
-                if (!!callBack) {
-                    callBack();
-                }
             });
-        });
+        //工资编号重复判断
+        /*var s = $("#SalaryNumber").val();
+        var sn = s.sort();
+        for (var j = 0; j <s.length; j++) {
+            if (sn[j] == sn[j+1]
+            ) {
+                alert("工资编号重复:" + sn[j]);
+            }
+                }*/
 
 
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs
index 61136f831..1718b8450 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EmpInfo/EmpInfoEntity.cs	
@@ -37,6 +37,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("GENDERNO")]
         public bool? GenderNo { get; set; }
+        /// <summary>
+        /// 工资编号
+        /// </summary>
+        [Column(name:"SALARYNUMBER")]
+        public string SalaryNumber { get; set; }
+
         /// <summary>
         /// 出生日期
         /// </summary>
@@ -345,7 +351,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
         [Column("OBTAINWAY")]
         public string ObtainWay { get; set; }
-
+        
         /// <summary>
         /// 入党（团）时间
         /// </summary>